diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index a71297eed..bf3a2bac6 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -1164,6 +1164,11 @@ var NMWirelessDialog = new Lang.Class({
             Util.ensureActorVisibleInScrollView(this._scrollView, network.item.actor);
             this._selectNetwork(network);
         });
+        network.item.actor.connect('destroy', () => {
+            let keyFocus = global.stage.key_focus;
+            if (keyFocus && keyFocus.contains(network.item.actor))
+                this._itemBox.grab_key_focus();
+        });
     },
 });