diff --git a/web/org.openbravo.mobile.core/source/component/ob-keyboard.js b/web/org.openbravo.mobile.core/source/component/ob-keyboard.js
--- a/web/org.openbravo.mobile.core/source/component/ob-keyboard.js
+++ b/web/org.openbravo.mobile.core/source/component/ob-keyboard.js
@@ -422,16 +422,11 @@
     } else if ((which === 13 && !OB.UTIL.isIOS()) || (OB.UTIL.isIOS() && inEvent.enterEvent)) { //Handle ENTER key
       actualStatus = this.getStatus();
       keeper = document.getElementById('_focusKeeper');
-      if (OB.MobileApp.view.scanMode) {
+      if (OB.MobileApp.view.scanMode && OB.MobileApp.model.get('useBarcode')) {
         // scanning using focusKeeper, take the value in the focusKeeper
         // some scanners do not send events for each character, that's why
         // the whole contents of focusKeeper are taken
         if (keeper) {
-          this.$.editbox.setContent(keeper.value);
-          keeper.value = '';
-        }
-      } else {
-        if (keeper) {
           if (keeper.value && keeper.value.length > 0) {
             this.$.editbox.setContent(keeper.value);
             keeper.value = '';
@@ -440,6 +435,9 @@
             this.$.editbox.setContent(this.$.editbox.getContent());
           }
         }
+      } else {
+        this.clearInput();
+        return;
       }
       if (this.$.editbox.getContent() === '0') {
         this.doCommandFired({
diff --git a/web/org.openbravo.mobile.core/source/component/ob-menu.js b/web/org.openbravo.mobile.core/source/component/ob-menu.js
--- a/web/org.openbravo.mobile.core/source/component/ob-menu.js
+++ b/web/org.openbravo.mobile.core/source/component/ob-menu.js
@@ -73,8 +73,6 @@
   onButtonTap: function () {
     // disable focus keeper while showing the menu
     this.originalSanMode = OB.MobileApp.view.scanMode;
-    OB.MobileApp.view.scanningFocus(false, true);
-
     if (this.$.mainMenuButton.hasClass('btn-over')) {
       this.$.mainMenuButton.removeClass('btn-over');
     }
diff --git a/web/org.openbravo.mobile.core/source/component/ob-terminal-component.js b/web/org.openbravo.mobile.core/source/component/ob-terminal-component.js
--- a/web/org.openbravo.mobile.core/source/component/ob-terminal-component.js
+++ b/web/org.openbravo.mobile.core/source/component/ob-terminal-component.js
@@ -233,7 +233,6 @@
     //Issue 25013. This flag is set by globalKeypressHandler function in ob-keyboard.js
     if (OB.MobileApp.model.get('useBarcode') && OB.MobileApp.keyPressProcessed) {
       delete OB.MobileApp.keyPressProcessed;
-      return;
     }
 
     this.waterfall('onGlobalKeypress', {