diff --git a/Step/SetupActive.iss b/Step/SetupActive.iss
index 2a412f5b..4f1a7714 100644
--- a/Step/SetupActive.iss
+++ b/Step/SetupActive.iss
@@ -257,8 +257,9 @@ var
           Result:= false;
           Exit;
         end;
-    Result:= True;
     end;
+    
+    Result:= True;
   end;
 
   function GetOverwriteConfig: Boolean;
diff --git a/Step/wwwroot/src/app_modules/scada/components/card-scada-production.ts b/Step/wwwroot/src/app_modules/scada/components/card-scada-production.ts
index 97c18e44..7c78202f 100644
--- a/Step/wwwroot/src/app_modules/scada/components/card-scada-production.ts
+++ b/Step/wwwroot/src/app_modules/scada/components/card-scada-production.ts
@@ -80,12 +80,14 @@ export default class CardScadaProduction extends Vue {
     await scadaService.SendButtonValue(this.scadaId, itemId);
   }
 
-  async sendInputValue(item:any, value: any) {
+  async sendInputValue($event, item:any, value: any) { 
     item.value.notUpdated = true;
     item.value.oldVal = item.value.value;
     await scadaService.SendInputValue(this.scadaId, item.id, value);
     item.value.notUpdated = false;
-    
+    // Remove focus from input
+    if($event)
+      $event.target.blur()
   }
 
   mounted() {
diff --git a/Step/wwwroot/src/app_modules/scada/components/card-scada-production.vue b/Step/wwwroot/src/app_modules/scada/components/card-scada-production.vue
index e311ff3e..72e670fb 100644
--- a/Step/wwwroot/src/app_modules/scada/components/card-scada-production.vue
+++ b/Step/wwwroot/src/app_modules/scada/components/card-scada-production.vue
@@ -86,7 +86,7 @@
               :disabled="!item.value.isEnabled"
               @focus="onFocus(item)"  
               @blur="onBlur(item)"
-              @keyup.enter="sendInputValue(item, item.value.value)"
+              @keyup.enter="sendInputValue($event, item, item.value.value);"
               :style="{ 
                       top: `${item.position.y + topShift}px`,
                       left: `${item.position.x + leftShift}px`,
@@ -104,7 +104,7 @@
               class="input-group-append">
                 <button class="appended-btn"
                   :disabled="!item.value.isEnabled"
-                  @mousedown="sendInputValue(item, item.value.value)"
+                  @mousedown="sendInputValue(null, item, item.value.value)"
                   :style="{                  
                         width: `${item.size.y + 3}px`,
                         height: `${item.size.y + 3}px`}">
diff --git a/Step/wwwroot/src/app_modules/scada/components/scada.ts b/Step/wwwroot/src/app_modules/scada/components/scada.ts
index d41527d7..531eee5b 100644
--- a/Step/wwwroot/src/app_modules/scada/components/scada.ts
+++ b/Step/wwwroot/src/app_modules/scada/components/scada.ts
@@ -99,11 +99,14 @@ export default class Scada extends Vue {
     await scadaService.SendButtonValue(this.currentScadaId, itemId);
   }
 
-  async sendInputValue(item: any, value: any) {
+  async sendInputValue($event, item: any, value: any) {
       item.value.updated = false;
       item.value.oldVal = item.value.value;
       await scadaService.SendInputValue(this.currentScadaId, item.id, value);
       item.value.updated = true;
+      // Remove focus from input
+      if($event)
+        $event.target.blur()
   }
 
   async mounted() {
diff --git a/Step/wwwroot/src/app_modules/scada/components/scada.vue b/Step/wwwroot/src/app_modules/scada/components/scada.vue
index bf580f27..6c95ba58 100644
--- a/Step/wwwroot/src/app_modules/scada/components/scada.vue
+++ b/Step/wwwroot/src/app_modules/scada/components/scada.vue
@@ -101,7 +101,7 @@
               :disabled="!item.value.isEnabled"
               @focus="onFocus(item)"  
               @blur="onBlur(item)"
-              @keyup.enter="sendInputValue(item, item.value.value)"
+              @keyup.enter="sendInputValue($event, item, item.value.value)"
               :style="{ 
                       top: `${item.position.y + topShift}px`,
                       left: `${item.position.x + leftShift}px`,
@@ -119,7 +119,7 @@
               class="input-group-append">
                 <button class="appended-btn"
                   :disabled="!item.value.isEnabled"
-                  @mousedown="sendInputValue(item, item.value.value)"
+                  @mousedown="sendInputValue(null, item, item.value.value)"
                   :style="{                  
                         width: `${item.size.y + 3}px`,
                         height: `${item.size.y + 3}px`}">