diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js
index eb6440279..f46b46aba 100644
--- a/src/commands/view/SelectComponent.js
+++ b/src/commands/view/SelectComponent.js
@@ -157,6 +157,15 @@ export default {
 
         if (el.ownerDocument === this.currentDoc) this.elHovered = result;
       });
+    } else {
+      this.currentDoc = null;
+      this.elHovered = 0;
+      this.updateToolsLocal();
+      this.canvas.getFrames().forEach(frame => {
+        const { view } = frame;
+        const el = view && view.getToolsEl();
+        el && this.toggleToolsEl(0, 0, { el });
+      });
     }
   },
 
@@ -209,15 +218,7 @@ export default {
   },
 
   onOut() {
-    this.currentDoc = null;
     this.em.setHovered(0);
-    this.elHovered = 0;
-    this.updateToolsLocal();
-    this.canvas.getFrames().forEach(frame => {
-      const { view } = frame;
-      const el = view && view.getToolsEl();
-      el && this.toggleToolsEl(0, 0, { el });
-    });
   },
 
   toggleToolsEl(on, view, opts = {}) {
diff --git a/src/navigator/view/ItemView.js b/src/navigator/view/ItemView.js
index b57921403..9705a22b7 100644
--- a/src/navigator/view/ItemView.js
+++ b/src/navigator/view/ItemView.js
@@ -15,6 +15,7 @@ export default Backbone.View.extend({
     'click [data-toggle-visible]': 'toggleVisibility',
     'click [data-toggle-select]': 'handleSelect',
     'mouseover [data-toggle-select]': 'handleHover',
+    'mouseout [data-toggle-select]': 'handleHoverOut',
     'click [data-toggle-open]': 'toggleOpening',
     'dblclick [data-name]': 'handleEdit',
     'focusout [data-name]': 'handleEditEnd'
@@ -249,6 +250,12 @@ export default Backbone.View.extend({
     em && config.showHover && em.setHovered(model, { fromLayers: 1 });
   },
 
+  handleHoverOut(ev) {
+    ev.stopPropagation();
+    const { em, config } = this;
+    em && config.showHover && em.setHovered(0, { fromLayers: 1 });
+  },
+
   /**
    * Delegate to sorter
    * @param	Event