diff --git a/packages/builder/src/components/common/DatePicker.svelte b/packages/builder/src/components/common/DatePicker.svelte
index 8533389595..6d5b03d934 100644
--- a/packages/builder/src/components/common/DatePicker.svelte
+++ b/packages/builder/src/components/common/DatePicker.svelte
@@ -26,9 +26,7 @@
 
 <div class="bb-margin-m">
   <label class="uk-form-label">{label}</label>
-  <div class="uk-form-controls">
-    <input
-      class="uk-input uk-form-width-{width} uk-form-{size}"
-      bind:this={input} />
-  </div>
+  <input
+    class="uk-input uk-form-width-{width} uk-form-{size}"
+    bind:this={input} />
 </div>
diff --git a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ComponentSelector.svelte b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ComponentSelector.svelte
index 19a89a018d..2e04f7d782 100644
--- a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ComponentSelector.svelte
+++ b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ComponentSelector.svelte
@@ -25,21 +25,19 @@
 
 <div class="bb-margin-xl block-field">
   <label class="uk-form-label">Page</label>
-  <div class="uk-form-controls">
-    <select class="budibase__input" bind:value={pageName}>
-      {#each Object.keys(pages) as page}
-        <option value={page}>{page}</option>
-      {/each}
-    </select>
-  </div>
+
+  <select class="budibase__input" bind:value={pageName}>
+    {#each Object.keys(pages) as page}
+      <option value={page}>{page}</option>
+    {/each}
+  </select>
+
   {#if components.length > 0}
     <label class="uk-form-label">Component</label>
-    <div class="uk-form-controls">
-      <select class="budibase__input" bind:value>
-        {#each components as component}
-          <option value={component._id}>{component._id}</option>
-        {/each}
-      </select>
-    </div>
+    <select class="budibase__input" bind:value>
+      {#each components as component}
+        <option value={component._id}>{component._id}</option>
+      {/each}
+    </select>
   {/if}
 </div>
diff --git a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte
index c6378499bd..db10b8f3b0 100644
--- a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte
+++ b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte
@@ -5,12 +5,10 @@
 </script>
 
 <div class="bb-margin-xl block-field">
-  <div class="uk-form-controls">
-    <select class="budibase__input" bind:value>
-      <option value="" />
-      {#each $backendUiStore.models as model}
-        <option value={model}>{model.name}</option>
-      {/each}
-    </select>
-  </div>
+  <select class="budibase__input" bind:value>
+    <option value="" />
+    {#each $backendUiStore.models as model}
+      <option value={model}>{model.name}</option>
+    {/each}
+  </select>
 </div>
diff --git a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte
index 793b97c5f0..7b4e6ee1db 100644
--- a/packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte
+++ b/packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte
@@ -6,20 +6,18 @@
 </script>
 
 <div class="bb-margin-xl block-field">
-  <div class="uk-form-controls">
-    <select class="budibase__input" bind:value={value.model}>
-      {#each $backendUiStore.models as model}
-        <option value={model}>{model.name}</option>
-      {/each}
-    </select>
-  </div>
+  <select class="budibase__input" bind:value={value.model}>
+    {#each $backendUiStore.models as model}
+      <option value={model}>{model.name}</option>
+    {/each}
+  </select>
 </div>
 
 {#if value.model}
   <div class="bb-margin-xl block-field">
     <label class="uk-form-label fields">Fields</label>
     {#each Object.keys(value.model.schema) as field}
-      <div class="uk-form-controls bb-margin-xl">
+      <div class="bb-margin-xl">
         <Input bind:value={value[field]} label={field} />
       </div>
     {/each}