diff --git a/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte b/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
index d0f6f24362..0ba502bbcb 100644
--- a/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
+++ b/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
@@ -91,7 +91,6 @@
       open = true
     }
   }}
-  {disabled}
 />
 
 <Popover
diff --git a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
index 965c1c2881..2b76bc6591 100644
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
@@ -152,10 +152,6 @@
     const parsedColumns = getValidColumns(columns, options)
     dispatch("change", parsedColumns)
   }
-
-  const toggleAll = update => {
-    listUpdated(update)
-  }
 </script>
 
 <div class="field-configuration">
@@ -167,7 +163,7 @@
           ...field,
           active: selectAll,
         }))
-        toggleAll(update)
+        listUpdated(update)
       }}
       text=""
       bind:value={selectAll}
diff --git a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte
index 75e6599a6c..1d9ce733b8 100644
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte
@@ -11,7 +11,6 @@
   export let componentBindings
   export let bindings
   export let anchor
-  export let updating //or disabled
 
   const dispatch = createEventDispatcher()
   const onToggle = item => {
@@ -50,7 +49,6 @@
       {bindings}
       {parseSettings}
       on:change
-      disabled={updating}
     >
       <div slot="header" class="type-icon">
         <Icon name={componentDef.icon} />
@@ -60,13 +58,7 @@
     <div class="field-label">{readableText}</div>
   </div>
   <div class="list-item-right">
-    <Toggle
-      on:change={onToggle(item)}
-      text=""
-      value={item.active}
-      thin
-      disabled={updating}
-    />
+    <Toggle on:change={onToggle(item)} text="" value={item.active} thin />
   </div>
 </div>