diff --git a/js/ui/shellEntry.js b/js/ui/shellEntry.js
index b82bc46e4..18fe7d199 100644
--- a/js/ui/shellEntry.js
+++ b/js/ui/shellEntry.js
@@ -76,6 +76,12 @@ const EntryMenu = new Lang.Class({
             this.actor.grab_key_focus();
 
         this.parent();
+        this._entry.add_style_pseudo_class('focus');
+    },
+
+    close: function() {
+        this._entry.grab_key_focus();
+        this.parent();
     },
 
     _updateCopyItem: function() {