diff --git a/src/components/Edges/EdgeWrapper.vue b/src/components/Edges/EdgeWrapper.vue
index 5b14f6df..bfea5782 100644
--- a/src/components/Edges/EdgeWrapper.vue
+++ b/src/components/Edges/EdgeWrapper.vue
@@ -70,35 +70,33 @@ const targetPosition = computed(() => (targetHandle.value ? targetHandle.value.p
 const edgeUpdaterRadius = computed(() => store.edgeUpdaterRadius)
 
 onMounted(() => {
-  nextTick(() => {
-    watch(
-      [
-        sourcePosition,
-        targetPosition,
-        () => edge.value.sourceNode.position,
-        () => edge.value.targetNode.position,
-        () => edge.value.sourceNode.computedPosition,
-        () => edge.value.targetNode.computedPosition,
-        () => edge.value.sourceNode.dimensions,
-        () => edge.value.targetNode.dimensions,
-      ],
-      () => {
-        const { sourceX, sourceY, targetY, targetX } = getEdgePositions(
-          edge.value.sourceNode,
-          sourceHandle.value,
-          sourcePosition.value,
-          edge.value.targetNode,
-          targetHandle.value,
-          targetPosition.value,
-        )
-        if (edge.value.sourceX !== sourceX) edge.value.sourceX = sourceX
-        if (edge.value.sourceY !== sourceY) edge.value.sourceY = sourceY
-        if (edge.value.targetX !== targetX) edge.value.targetX = targetX
-        if (edge.value.targetY !== targetY) edge.value.targetY = targetY
-      },
-      { immediate: true, deep: true },
-    )
-  })
+  watch(
+    [
+      sourcePosition,
+      targetPosition,
+      () => edge.value.sourceNode.position,
+      () => edge.value.targetNode.position,
+      () => edge.value.sourceNode.computedPosition,
+      () => edge.value.targetNode.computedPosition,
+      () => edge.value.sourceNode.dimensions,
+      () => edge.value.targetNode.dimensions,
+    ],
+    () => {
+      const { sourceX, sourceY, targetY, targetX } = getEdgePositions(
+        edge.value.sourceNode,
+        sourceHandle.value,
+        sourcePosition.value,
+        edge.value.targetNode,
+        targetHandle.value,
+        targetPosition.value,
+      )
+      if (edge.value.sourceX !== sourceX) edge.value.sourceX = sourceX
+      if (edge.value.sourceY !== sourceY) edge.value.sourceY = sourceY
+      if (edge.value.targetX !== targetX) edge.value.targetX = targetX
+      if (edge.value.targetY !== targetY) edge.value.targetY = targetY
+    },
+    { immediate: true, deep: true },
+  )
 })
 </script>
 <script lang="ts">
@@ -112,6 +110,7 @@ export default {
     :class="[
       'vue-flow__edge',
       `vue-flow__edge-${edge.type || 'default'}`,
+      store.noPanClassName,
       {
         selected: edge.selected,
         animated: edge.animated,
diff --git a/src/store/actions.ts b/src/store/actions.ts
index ebe6bea0..71a4eaf7 100644
--- a/src/store/actions.ts
+++ b/src/store/actions.ts
@@ -1,19 +1,19 @@
 import useState from './state'
 import {
-  CoordinateExtent,
-  EdgeChange,
   Actions,
   ComputedGetters,
-  State,
+  Connection,
+  CoordinateExtent,
+  Edge,
+  EdgeChange,
+  Getters,
+  GraphEdge,
   GraphNode,
   Node,
   NodeChange,
   NodeDimensionChange,
-  Edge,
-  Connection,
-  GraphEdge,
   NodePositionChange,
-  Getters,
+  State,
 } from '~/types'
 import {
   applyChanges,
@@ -149,11 +149,10 @@ export default (state: State, getters: ComputedGetters): Actions => {
           dimensions.height &&
           (node.dimensions.width !== dimensions.width || node.dimensions.height !== dimensions.height || update.forceUpdate)
         )
+        node.handleBounds = getHandleBounds(update.nodeElement, state.transform[2])
 
         if (doUpdate) {
-          const handleBounds = getHandleBounds(update.nodeElement, state.transform[2])
           node.dimensions = dimensions
-          node.handleBounds = handleBounds
 
           res.push({
             id: node.id,