diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js
index fb9c85c5e..713c4cd5c 100644
--- a/src/commands/view/SelectComponent.js
+++ b/src/commands/view/SelectComponent.js
@@ -204,6 +204,8 @@ export default {
   onOut() {
     this.currentDoc = null;
     this.em.setHovered(0);
+    this.elHovered = undefined;
+    this.updateToolsLocal();
     this.canvas.getFrames().forEach(frame => {
       const { view } = frame;
       const el = view && view.getToolsEl();