diff --git a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
index c8a1f94402..8ba32c47cf 100644
--- a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
+++ b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
@@ -82,7 +82,7 @@
     })
   }
 
-  $: isHighlighted && scrollToElement(domElement)
+  $: highlightedProp && isHighlighted && scrollToElement(domElement)
 </script>
 
 <div