diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js
index 32d4652aa..39cb8820a 100644
--- a/src/commands/view/SelectComponent.js
+++ b/src/commands/view/SelectComponent.js
@@ -126,8 +126,9 @@ export default {
    * @param {Object}  el
    * @private
    * */
-  onSelect(component) {
+  onSelect() {
     const { em } = this;
+    const component = em.getSelected();
     const currentFrame = em.get('currentFrame') || {};
     const prevComp = this.getElSelected().component;
     if (component && component === prevComp) return;
@@ -716,6 +717,7 @@ export default {
     const { el, pos, component } = this.getElSelected();
 
     if (!el) {
+      this.toggleToolsEl(); // Hides toolbar
       this.lastSelected = 0;
       return;
     }
@@ -732,7 +734,6 @@ export default {
     const frameOff = this.frameRectOffset(el, pos);
     const topOff = frameOff.top;
     const leftOff = frameOff.left;
-    console.log({ el, frameOff });
     style.top = topOff + unit;
     style.left = leftOff + unit;
     style.width = pos.width + unit;
diff --git a/src/style_manager/view/SectorsView.js b/src/style_manager/view/SectorsView.js
index 9754a32e4..b4aa21f7d 100644
--- a/src/style_manager/view/SectorsView.js
+++ b/src/style_manager/view/SectorsView.js
@@ -43,7 +43,7 @@ export default Backbone.View.extend({
    * Fired when target is updated
    * @private
    */
-  targetUpdated() {
+  targetUpdated(cmp) {
     const em = this.target;
     const pt = this.propTarget;
     let model = em.getSelected();