diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 16064ebde..eb63266b1 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -2031,18 +2031,25 @@ const MessageTray = new Lang.Class({
     },
 
     openTray: function() {
+        if (Main.overview.animationInProgress)
+            return;
+
         this._traySummoned = true;
         this._updateState();
     },
 
     toggle: function() {
+        if (Main.overview.animationInProgress)
+            return false;
+
         this._traySummoned = !this._traySummoned;
         this._updateState();
+        return true;
     },
 
     toggleAndNavigate: function() {
-        this.toggle();
-        this._summary.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+        if (this.toggle())
+            this._summary.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
     },
 
     hide: function() {