diff --git a/src/commands/index.js b/src/commands/index.js
index 8eede3028..21dd044b5 100644
--- a/src/commands/index.js
+++ b/src/commands/index.js
@@ -149,12 +149,14 @@ export default () => {
             em.trigger(eventDrag, data);
           };
           const onEnd = (e, opts, data) => {
-            em.runDefault(defComOptions);
             selAll.forEach(sel => sel.set('status', 'selected'));
             ed.select(selAll);
             sel.emitUpdate();
             em.trigger(`${eventDrag}:end`, data);
 
+            // Defer selectComponent in order to prevent canvas "freeze" #2692
+            setTimeout(() => em.runDefault(defComOptions));
+
             // Dirty patch to prevent parent selection on drop
             (altMode || data.cancelled) && em.set('_cmpDrag', 1);
           };