diff --git a/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js b/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
index 86a11250..f1a984c0 100644
--- a/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
+++ b/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
@@ -2519,6 +2519,15 @@ OB.Model.Terminal = Backbone.Model.extend({
             return;
           }
 
+          var currentWindow = OB.MobileApp.model.get('currentWindow');
+          if (
+            currentWindow === 'retail.pointofsale' &&
+            args.route === 'retail.selfcheckout'
+          ) {
+            if (OB.MobileApp.view.openedPopup) {
+              OB.MobileApp.view.openedPopup.hide();
+            }
+          }
           if (args.window && args.window.navigateTo) {
             args.window.navigateTo(
               args,