diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js
index 2727daab5..1b05fbe61 100644
--- a/src/commands/view/SelectComponent.js
+++ b/src/commands/view/SelectComponent.js
@@ -103,7 +103,6 @@ export default {
   },
 
   onHovered(em, component) {
-    const el = component && component.getEl();
     let result = {};
 
     if (component) {
@@ -115,8 +114,6 @@ export default {
       });
     }
 
-    console.log('Hovered', component);
-
     this.elHovered = result;
   },
 
@@ -166,6 +163,7 @@ export default {
   },
 
   onOut() {
+    this.em.setHovered(0);
     this.canvas.getFrames().forEach(frame => {
       const el = frame.view.getToolsEl();
       this.toggleToolsEl(0, 0, { el });
diff --git a/src/dom_components/view/ComponentView.js b/src/dom_components/view/ComponentView.js
index fadbb7b71..706a4aa8e 100644
--- a/src/dom_components/view/ComponentView.js
+++ b/src/dom_components/view/ComponentView.js
@@ -42,7 +42,7 @@ export default Backbone.View.extend({
     $el.data('model', model);
     setViewEl(el, this);
     model.view = this;
-    model.views.push(this);
+    this._getFrame() && model.views.push(this);
     this.initClasses();
     this.initComponents({ avoidRender: 1 });
     this.events = {