diff --git a/js/ui/panel.js b/js/ui/panel.js
index 66588f9c1..5b2ee63d8 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -998,8 +998,8 @@ var Panel = new Lang.Class({
     },
 
     _toggleMenu(indicator) {
-        if (!indicator) // menu not supported by current session mode
-            return;
+        if (!indicator || !indicator.container.visible)
+            return; // menu not supported by current session mode
 
         let menu = indicator.menu;
         if (!indicator.actor.reactive)