diff --git a/Step/wwwroot/assets/styles/base/maintenance.less b/Step/wwwroot/assets/styles/base/maintenance.less
index ddecd0ae..ff672cbe 100644
--- a/Step/wwwroot/assets/styles/base/maintenance.less
+++ b/Step/wwwroot/assets/styles/base/maintenance.less
@@ -283,12 +283,14 @@
                 background-color: white;
                 margin-right: 24px;
                 .message-disable-maintenance{
-                    width: 100%;
-                    height: 100%;
+                    width: 101%;
+                    height: 101%;
+                    position: absolute;
                     display: flex;
                     align-items: center;
                     justify-content: center;
                     z-index: 200;
+                    background-color: #ffffffcc;
                 }
             }
         }
diff --git a/Step/wwwroot/src/components/maintenance.ts b/Step/wwwroot/src/components/maintenance.ts
index 1a2d95f5..3a1f432d 100644
--- a/Step/wwwroot/src/components/maintenance.ts
+++ b/Step/wwwroot/src/components/maintenance.ts
@@ -65,7 +65,8 @@ export default class Maintenance extends Vue {
     updated(){
         $(document).mouseup(function (e) {
             var container = $(".checkboxes");
-            if (!container.is(e.target) && container.has(e.target).length === 0) 
+            var selector = $("#selectListCheckboxes");
+            if (!container.is(e.target) && !selector.is(e.target) && container.has(e.target).length === 0) 
             {
                 container.removeClass('checkboxesView');
             }
@@ -73,7 +74,10 @@ export default class Maintenance extends Vue {
     }
 
     public openSelectState(){
-        $('.checkboxes').addClass('checkboxesView');
+        if(!$('.checkboxes').hasClass('checkboxesView'))
+            $('.checkboxes').addClass('checkboxesView');
+        else            
+            $('.checkboxes').removeClass('checkboxesView');
     }
 
     public controlState(state){
diff --git a/Step/wwwroot/src/components/maintenance.vue b/Step/wwwroot/src/components/maintenance.vue
index 1b7ca159..cb1c9cdb 100644
--- a/Step/wwwroot/src/components/maintenance.vue
+++ b/Step/wwwroot/src/components/maintenance.vue
@@ -111,7 +111,7 @@
               </div>
             </div>
             <div class="maintenance-box-right">
-              <maintenance-card v-if="!enableMaintenance"
+              <maintenance-card 
               :can-edit="selectedMaintenance != null ? canPerform(selectedMaintenance.canEdit,selectedMaintenance.type,selectedMaintenance.lastPerformedDate) : false"
               :can-delete="selectedMaintenance != null ? selectedMaintenance.canEdit : false"
               :class="{ 'border-red' : selectedMaintenance != null ? setBorderRedCard(selectedMaintenance.percentageOfCompletion): false,