diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index bc430ee92c..669cc8afdc 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -446,7 +446,7 @@
   const scrollIntoView = () => {
     // Don't scroll into view if we selected this component because we were
     // starting dragging on it
-    if (get(builderStore).dragging) {
+    if (get(dndIsDragging)) {
       return
     }
     const node = document.getElementsByClassName(id)?.[0]?.children[0]
diff --git a/packages/client/src/utils/computed.js b/packages/client/src/utils/computed.js
new file mode 100644
index 0000000000..e69de29bb2