diff --git a/src/dom_components/view/ComponentView.js b/src/dom_components/view/ComponentView.js
index 9ca3da7ed..61881bde4 100644
--- a/src/dom_components/view/ComponentView.js
+++ b/src/dom_components/view/ComponentView.js
@@ -46,7 +46,7 @@ export default Backbone.View.extend({
     this.initComponents({ avoidRender: 1 });
     this.events = {
       ...this.events,
-      ...(this.__isDraggable() && { dragstart: 'handleDragStart' }),
+      dragstart: 'handleDragStart',
     };
     this.delegateEvents();
     !modelOpt.temporary && this.init(this._clbObj());
@@ -107,8 +107,9 @@ export default Backbone.View.extend({
   },
 
   handleDragStart(event) {
-    event.preventDefault();
+    if (!this.__isDraggable()) return false;
     event.stopPropagation();
+    event.preventDefault();
     this.em.get('Commands').run('tlb-move', {
       target: this.model,
       event,
@@ -290,7 +291,7 @@ export default Backbone.View.extend({
 
     const defaultAttr = {
       'data-gjs-type': type || 'default',
-      ...(this.__isDraggable() ? { draggable: true } : {}),
+      ...(this.__isDraggable() && { draggable: true }),
       ...(highlightable ? { 'data-highlightable': 1 } : {}),
       ...(textable
         ? {
diff --git a/src/utils/Sorter.js b/src/utils/Sorter.js
index 1449a8fd3..ae28323f2 100644
--- a/src/utils/Sorter.js
+++ b/src/utils/Sorter.js
@@ -44,7 +44,7 @@ export default Backbone.View.extend({
     this.document = o.document || document;
     this.$document = $(this.document);
     this.dropContent = null;
-    this.em = o.em || '';
+    this.em = o.em || null;
     this.dragHelper = null;
     this.canvasRelative = o.canvasRelative || 0;
     this.selectOnEnd = !o.avoidSelectOnEnd;