diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 5a2e3d266..30cb6a7e6 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1715,10 +1715,8 @@ const MessageTray = new Lang.Class({
     },
 
     toggleAndNavigate: function() {
-        // Grab the key focus so that GrabHelper knows
-        // that we have the key grab.
-        this._summary.grab_key_focus();
         this.toggle();
+        this._summary.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
     },
 
     hide: function() {