diff --git a/shell/model/devices/devicesmodel.py b/shell/model/devices/devicesmodel.py
index 4a2148ce..8b0dc9dd 100644
--- a/shell/model/devices/devicesmodel.py
+++ b/shell/model/devices/devicesmodel.py
@@ -75,7 +75,8 @@ class DevicesModel(gobject.GObject):
         pass
 
     def _network_device_removed_cb(self, network_manager, nm_device):
-        self.remove_device(self._get_network_device(nm_device))
+        if self._devices.has_key(str(nm_device.get_op())):
+            self.remove_device(self._get_network_device(nm_device))
 
     def _check_network_device(self, nm_device):
         if not nm_device.is_valid():
diff --git a/shell/view/home/MeshBox.py b/shell/view/home/MeshBox.py
index 322d07fb..20829a0e 100644
--- a/shell/view/home/MeshBox.py
+++ b/shell/view/home/MeshBox.py
@@ -239,7 +239,7 @@ class MeshBox(SpreadBox):
         self._add_mesh_icon(mesh)
 
     def _mesh_removed_cb(self, model):
-        self._remove_mesh_icon()
+        self._remove_mesh()
 
     def _buddy_added_cb(self, model, buddy_model):
         self._add_alone_buddy(buddy_model)
@@ -270,7 +270,7 @@ class MeshBox(SpreadBox):
         self._mesh = MeshDeviceView(mesh)
         self.add_item(self._mesh)
 
-    def _remove_access_point(self):
+    def _remove_mesh(self):
         if not self._mesh:
             return
         self.remove_item(self._mesh)