diff --git a/public/app/features/canvas/runtime/scene.tsx b/public/app/features/canvas/runtime/scene.tsx
index 5c454bbcb23..001100523e9 100644
--- a/public/app/features/canvas/runtime/scene.tsx
+++ b/public/app/features/canvas/runtime/scene.tsx
@@ -385,7 +385,7 @@ export class Scene {
 
     this.selecto = new Selecto({
       container: this.div,
-      rootContainer: this.div,
+      rootContainer: this.transformComponentRef?.current?.instance.wrapperComponent,
       selectableTargets: targetElements,
       toggleContinueSelect: 'shift',
       selectFromInside: false,
@@ -706,6 +706,7 @@ export class Scene {
             this.moveable.zoom = 1 / scale;
           }
         }}
+        limitToBounds={true}
       >
         <div
           style={{
diff --git a/public/app/plugins/panel/canvas/components/connections/Connections.tsx b/public/app/plugins/panel/canvas/components/connections/Connections.tsx
index e3e5ac6e492..65e1863d024 100644
--- a/public/app/plugins/panel/canvas/components/connections/Connections.tsx
+++ b/public/app/plugins/panel/canvas/components/connections/Connections.tsx
@@ -103,7 +103,10 @@ export class Connections {
     }
 
     const elementBoundingRect = element.div!.getBoundingClientRect();
-    const parentBoundingRect = this.scene.div?.getBoundingClientRect();
+    const transformRef = this.scene.transformComponentRef?.current;
+
+    const parentBoundingRect = transformRef?.instance.wrapperComponent?.getBoundingClientRect();
+    const transScale = transformRef?.instance.transformState.scale ?? 1;
 
     const relativeTop = elementBoundingRect.top - (parentBoundingRect?.top ?? 0);
     const relativeLeft = elementBoundingRect.left - (parentBoundingRect?.left ?? 0);
@@ -111,10 +114,10 @@ export class Connections {
     if (this.connectionAnchorDiv) {
       this.connectionAnchorDiv.style.display = 'none';
       this.connectionAnchorDiv.style.display = 'block';
-      this.connectionAnchorDiv.style.top = `${relativeTop}px`;
-      this.connectionAnchorDiv.style.left = `${relativeLeft}px`;
-      this.connectionAnchorDiv.style.height = `${elementBoundingRect.height}px`;
-      this.connectionAnchorDiv.style.width = `${elementBoundingRect.width}px`;
+      this.connectionAnchorDiv.style.top = `${relativeTop / transScale}px`;
+      this.connectionAnchorDiv.style.left = `${relativeLeft / transScale}px`;
+      this.connectionAnchorDiv.style.height = `${elementBoundingRect.height / transScale}px`;
+      this.connectionAnchorDiv.style.width = `${elementBoundingRect.width / transScale}px`;
     }
   };