diff --git a/packages/builder/package.json b/packages/builder/package.json
index 9de3db2b7b..7ad320b4c7 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -63,7 +63,7 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.56.0",
+    "@budibase/bbui": "^1.58.0",
     "@budibase/client": "^0.7.4",
     "@budibase/colorpicker": "1.0.1",
     "@budibase/string-templates": "^0.7.4",
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiOptionSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiOptionSelect.svelte
index d31e7a2b15..85e2c33d01 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiOptionSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiOptionSelect.svelte
@@ -22,7 +22,7 @@
 </script>
 
 <div>
-  <Multiselect extraThin secondary value={boundValue} on:change={setValue}>
+  <Multiselect align="right" extraThin secondary value={boundValue} on:change={setValue}>
     {#each options as option}
       <option value={option}>{option}</option>
     {/each}
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte
index 6f78484339..525a441122 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte
@@ -125,7 +125,7 @@
 
   .control {
     flex: 1;
-    display: flex;
+    display: inline-block;
     padding-left: 2px;
     overflow: hidden;
   }
diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock
index 186e330135..f3559c0854 100644
--- a/packages/builder/yarn.lock
+++ b/packages/builder/yarn.lock
@@ -842,10 +842,10 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@budibase/bbui@^1.56.0":
-  version "1.56.0"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.56.0.tgz#91376f11b43706fd380291e9a5283760996eb62b"
-  integrity sha512-OEFC7MapbJk7Bd7oo79cVOq9BIcK1x8XPHLC1lB2N4hts37IygzB4Egg6JZBD7rh7CqU8ppc4W7wkfQbaXEO1Q==
+"@budibase/bbui@^1.58.0":
+  version "1.58.0"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.58.0.tgz#197a44188138e28a006f5b1074dab53ae7986d72"
+  integrity sha512-YNdBIpD7n50S+8kvYavp2P0pVPL56cHfpaFMWL5jaJynohsc4ERmlH0LmZZfkSFLnkf07OszoLRYcVQOdUgQdg==
   dependencies:
     markdown-it "^12.0.2"
     quill "^1.3.7"