diff --git a/public/app/features/canvas/runtime/scene.tsx b/public/app/features/canvas/runtime/scene.tsx
index 3c4daee26d6..cb47f6b4af4 100644
--- a/public/app/features/canvas/runtime/scene.tsx
+++ b/public/app/features/canvas/runtime/scene.tsx
@@ -311,6 +311,8 @@ export class Scene {
       container: this.div,
       selectableTargets: targetElements,
       toggleContinueSelect: 'shift',
+      selectFromInside: false,
+      hitRate: 0,
     });
 
     this.moveable = new Moveable(this.div!, {
@@ -420,12 +422,15 @@ export class Scene {
       targets = event.selected;
       this.updateSelection({ targets });
 
-      if (event.isDragStart) {
-        event.inputEvent.preventDefault();
-        setTimeout(() => {
-          this.moveable!.dragStart(event.inputEvent);
-        });
-      }
+      // @TODO Figure out click-drag functionality without phantom mouseup issue
+      // https://github.com/daybrush/moveable/issues/481
+
+      // if (event.isDragStart) {
+      //   event.inputEvent.preventDefault();
+      //   setTimeout(() => {
+      //     this.moveable!.dragStart(event.inputEvent);
+      //   });
+      // }
     });
   };