diff --git a/web_responsive/static/src/js/web_responsive.js b/web_responsive/static/src/js/web_responsive.js
index 3619bbc5..366e1871 100644
--- a/web_responsive/static/src/js/web_responsive.js
+++ b/web_responsive/static/src/js/web_responsive.js
@@ -7,6 +7,7 @@ odoo.define('web_responsive', function (require) {
     var ActionManager = require('web.ActionManager');
     var AbstractWebClient = require("web.AbstractWebClient");
     var AppsMenu = require("web.AppsMenu");
+    var BasicController = require('web.BasicController');
     var config = require("web.config");
     var core = require("web.core");
     var FormRenderer = require('web.FormRenderer');
@@ -112,6 +113,14 @@ odoo.define('web_responsive', function (require) {
             return this._super.apply(this, arguments);
         },
 
+        /**
+         * @override
+         */
+        _onAppsMenuItemClicked: function (ev) {
+            this._super.apply(this, arguments);
+            ev.preventDefault();
+        },
+
         /**
          * Get all info for a given menu.
          *
@@ -276,10 +285,21 @@ odoo.define('web_responsive', function (require) {
         },
     });
 
+    BasicController.include({
+        
+        /**
+         * @override
+         */
+        canBeDiscarded: function (recordID) {
+            if (this.model.isDirty(recordID || this.handle)) {
+                $('.o_menu_apps .dropdown:has(.dropdown-menu.show) > a').dropdown('toggle');
+            }
+            return this._super.apply(this, arguments);
+        },
+    });
+
     Menu.include({
         events: _.extend({
-            // Clicking on apps menu
-    	    "click .o_menu_apps a[data-toggle=dropdown]": "_onAppsMenuClick",
             // Clicking a hamburger menu item should close the hamburger
             "click .o_menu_sections [role=menuitem]": "_hideMobileSubmenus",
             // Opening any dropdown in the navbar should hide the hamburger
@@ -326,22 +346,6 @@ odoo.define('web_responsive', function (require) {
                 return this._super.apply(this, arguments);
             }
         },
-        
-        /**
-         * Check if Controller can be removed
-         */
-        _onAppsMenuClick: function(event, checkedCanBeRemoved) {
-            var action_manager = this.getParent().action_manager;
-            var controller = action_manager.getCurrentController();
-            if (controller && !checkedCanBeRemoved) {
-                controller.widget.canBeRemoved().done(function () {
-                    $(event.currentTarget).trigger('click', [true]);
-                    $(event.currentTarget).off('.bs.dropdown');
-                });
-                event.stopPropagation();
-                event.preventDefault();
-            }
-        },
     });
 
     RelationalFields.FieldStatus.include({