diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte
index 3843eabf45..2678843593 100644
--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@@ -343,7 +343,7 @@
             secondary
             quiet
             on:click={() => {
-              store.actions.settings.propertyFocus(null)
+              // store.actions.settings.propertyFocus(null)
               drawerActions.hide()
             }}
           >
diff --git a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
index f41b66bd77..a755220504 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
@@ -36,7 +36,7 @@
 
   const saveBinding = () => {
     onChange(tempValue)
-    store.actions.settings.propertyFocus(null)
+    // store.actions.settings.propertyFocus(null)
     onBlur()
     bindingDrawer.hide()
   }
@@ -70,7 +70,7 @@
     <div
       class="icon"
       on:click={() => {
-        store.actions.settings.propertyFocus(key)
+        //store.actions.settings.propertyFocus(key)
         bindingDrawer.show()
       }}
     >
diff --git a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
index daa3f29592..0d1bb01d15 100644
--- a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
+++ b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
@@ -74,9 +74,9 @@
       store.actions.settings.highlight(null)
     }
     // To fix focus 'affect' when property is target of a drawer other actions in the builder.
-    if (propertyFocus) {
-      store.actions.settings.propertyFocus(null)
-    }
+    // if (propertyFocus) {
+    //   store.actions.settings.propertyFocus(null)
+    // }
   })
 </script>