diff --git a/src/commands/index.js b/src/commands/index.js
index 9b82f8280..78554a65c 100644
--- a/src/commands/index.js
+++ b/src/commands/index.js
@@ -131,9 +131,6 @@ export default () => {
           const mode = sel.get('dmode') || em.get('dmode');
           const hideTlb = () => em.stopDefault(defComOptions);
 
-          // Dirty patch to prevent parent selection on drop (in absolute mode)
-          em.set('_cmpDrag', 1);
-
           if (!sel || !sel.get('draggable')) {
             return em.logWarning('The element is not draggable');
           }
@@ -149,6 +146,9 @@ export default () => {
           };
 
           if (includes(modes, mode)) {
+            // Dirty patch to prevent parent selection on drop
+            em.set('_cmpDrag', 1);
+
             // TODO move grabbing func in editor/canvas from the Sorter
             dragger = ed.runCommand('core:component-drag', {
               guidesInfo: 1,
diff --git a/src/commands/view/SelectComponent.js b/src/commands/view/SelectComponent.js
index b39669bf7..c3db1ae68 100644
--- a/src/commands/view/SelectComponent.js
+++ b/src/commands/view/SelectComponent.js
@@ -60,9 +60,6 @@ export default {
     em[method]('component:update', this.onComponentUpdate, this);
     em[method]('component:resize', this.updateGlobalPos, this);
     em[method]('change:canvasOffset', this.updateAttached, this);
-    // const body = this.getCanvasBody();
-    // const win = this.getContentWindow();
-    // trigger(win, body); // TODO remove
     em.get('Canvas')
       .getFrames()
       .forEach(frame => {
@@ -129,7 +126,6 @@ export default {
   onSelect: debounce(function() {
     const { em } = this;
     const component = em.getSelected();
-    console.log('onSelect', { component });
     const currentFrame = em.get('currentFrame') || {};
     const view = component && component.getView(currentFrame.model);
     let el = view && view.el;
@@ -244,12 +240,12 @@ export default {
    * @param {Event}  e
    * @private
    */
-  onClick(e) {
+  onClick(ev) {
+    ev.stopPropagation();
+    ev.preventDefault();
     const { em } = this;
-    e.stopPropagation();
-    e.preventDefault();
     if (em.get('_cmpDrag')) return em.set('_cmpDrag');
-    const $el = $(e.target);
+    const $el = $(ev.target);
     let model = $el.data('model');
 
     if (!model) {
@@ -262,11 +258,11 @@ export default {
 
     if (model) {
       if (model.get('selectable')) {
-        this.select(model, e);
+        this.select(model, ev);
       } else {
         let parent = model.parent();
         while (parent && !parent.get('selectable')) parent = parent.parent();
-        this.select(parent, e);
+        this.select(parent, ev);
       }
     }
   },