diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 2a830c81b..c78c6696e 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -1064,7 +1064,8 @@ const NMDeviceWireless = new Lang.Class({
     },
 
     getIndicatorIcon: function() {
-        if (this._device.active_connection.state == NetworkManager.ActiveConnectionState.ACTIVATING)
+        if (this._device.state >= NetworkManager.DeviceState.PREPARE &&
+            this._device.state < NetworkManager.DeviceState.ACTIVATED)
             return 'network-wireless-acquiring-symbolic';
 
         let ap = this._device.active_access_point;