diff --git a/js/ui/panel.js b/js/ui/panel.js
index 3ec9a3b4f..8aa3265d8 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -300,6 +300,10 @@ AppMenuButton.prototype = {
 
         this._visible = true;
         this.actor.show();
+
+        if (!this._targetIsCurrent)
+            return;
+
         Tweener.removeTweens(this.actor);
         Tweener.addTween(this.actor,
                          { opacity: 255,
@@ -312,6 +316,11 @@ AppMenuButton.prototype = {
             return;
 
         this._visible = false;
+        if (!this._targetIsCurrent) {
+            this.actor.hide();
+            return;
+        }
+
         Tweener.removeTweens(this.actor);
         Tweener.addTween(this.actor,
                          { opacity: 0,