diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js
index 39cb8820a..c273e6626 100644
--- a/src/commands/view/SelectComponent.js
+++ b/src/commands/view/SelectComponent.js
@@ -145,12 +145,6 @@ export default {
     this.elSelected = result;
     this.updateToolsGlobal();
 
-    // // Get the selected model directly from the Editor as the event might
-    // // be triggered manually without the model
-    // const model = this.em.getSelected();
-    // const el = model && model.getEl();
-    // this.updateToolbar(model);
-
     // if (el) {
     //   this.showFixedElementOffset(el);
     //   this.hideElementOffset();
@@ -636,14 +630,6 @@ export default {
     return this.canvas.getCanvasView().getPosition();
   },
 
-  /**
-   * Removes all highlighting effects on components
-   * @private
-   * */
-  clean() {
-    if (this.selEl) this.selEl.removeClass(this.hoverClass);
-  },
-
   /**
    * Returns badge element
    * @return {HTMLElement}
@@ -811,14 +797,10 @@ export default {
 
   stop(ed, sender, opts = {}) {
     const { em, editor } = this;
-    const hovered = em.getHovered();
     this.stopSelectComponent();
     !opts.preserveSelected && em.setSelected(null);
-    if (!hovered) return;
-    this.clean();
     this.onOut();
-    this.hideFixedElementOffset();
-    this.canvas.getToolbarEl().style.display = 'none';
+    this.toggleToolsEl();
     editor && editor.stopCommand('resize');
   }
 };