diff --git a/Step/wwwroot/src/modules/plc-softkeys.vue b/Step/wwwroot/src/modules/plc-softkeys.vue
index f10a035b..107d7814 100644
--- a/Step/wwwroot/src/modules/plc-softkeys.vue
+++ b/Step/wwwroot/src/modules/plc-softkeys.vue
@@ -12,7 +12,8 @@
     </header>
     <div class="title" >{{'maint_' + selectedSection | localize('maint_' + selectedSection) }}</div>
     <section class="scrollable">
-      <group-soft-key v-for="b in sectionButtons(selectedSection)" :key="b.id"
+      <div v-for="b in sectionButtons(selectedSection)" :key="b.id">
+      <group-soft-key
                       v-if="b.type==2" :title="'softkey_' + b.id | localize('softkey_' + b.id)"
                       :selected="false"
                       :subkeys="b.subKeys"
@@ -20,15 +21,16 @@
                       :activeSubKeys="getSubKeysActive(b.subKeys)"
                       @position="setSoftKeyPosition"
                       @click="toggleMenu(b)"></group-soft-key>
-      <on-off-soft-key v-for="b in sectionButtons(selectedSection)" :key="b.id"
+      <on-off-soft-key
                        :disabled="!getSoftKeyActive(b.id)"
                        v-if="b.type==0" :title="'softkey_' + b.id | localize('softkey_' + b.id)"
                        :checked="getSoftKeyStatus(b.id)"
                        @checkChanged="softKeyChanged(b.id)"></on-off-soft-key>
-      <procedure-soft-key v-for="b in sectionButtons(selectedSection)" :key="b.id"
+      <procedure-soft-key
                           :disabled="!getSoftKeyActive(b.id)"
                           @click="softKeyChanged(b.id)"
                           v-if="b.type==1" :title="'softkey_' + b.id | localize('softkey_' + b.id)" ></procedure-soft-key>
+      </div>
     </section>
     <group-soft-key v-if="selectedSoftKey!=null"
                     :title="'softkey_' + selectedSoftKey.id | localize('softkey_' + selectedSoftKey.id)"
diff --git a/Step/wwwroot/src/modules/under-the-hood/soft-key1.vue b/Step/wwwroot/src/modules/under-the-hood/soft-key1.vue
index 0a8ce37f..35c42106 100644
--- a/Step/wwwroot/src/modules/under-the-hood/soft-key1.vue
+++ b/Step/wwwroot/src/modules/under-the-hood/soft-key1.vue
@@ -41,12 +41,12 @@ export default {
   methods: {
     getSoftKeyStatus(id) {
       if (this.subkeysStatus)
-      return this.subkeysStatus[id] || false;
+        return this.subkeysStatus[id] || false;
       return false;
     },
     getSoftKeyActive(id) {
       if(this.activeSubKeys)
-      return this.activeSubKeys[id] || false;
+        return this.activeSubKeys[id] || false;
       return false;
     },
     getSubKeyText(value) {
diff --git a/Step/wwwroot/src/modules/under-the-hood/soft-key2.vue b/Step/wwwroot/src/modules/under-the-hood/soft-key2.vue
index f0aa8406..c62ab706 100644
--- a/Step/wwwroot/src/modules/under-the-hood/soft-key2.vue
+++ b/Step/wwwroot/src/modules/under-the-hood/soft-key2.vue
@@ -33,6 +33,9 @@ export default {
       this.ischecked = n;
     }
   },
+  mounted: function() {
+    this.ischecked = this.checked;
+  },
   methods: {
     toggleCheck() {
       this.$emit("checkChanged");