diff --git a/js/ui/panel.js b/js/ui/panel.js
index dc6536655..d7c8397b5 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -1084,8 +1084,6 @@ var Panel = new Lang.Class({
             let indicator = this.statusArea[role];
             if (!indicator)
                 continue;
-            if (indicator.menu)
-                indicator.menu.close();
             indicator.container.hide();
         }
     },
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index a2a4df340..d00132ff9 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -465,6 +465,7 @@ var PopupMenuBase = new Lang.Class({
 
     _sessionUpdated: function() {
         this._setSettingsVisibility(Main.sessionMode.allowSettings);
+        this.close();
     },
 
     addAction: function(title, callback, icon) {