diff --git a/packages/builder/package.json b/packages/builder/package.json
index 947bce4b6a..75771540f3 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -63,7 +63,7 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.58.6",
+    "@budibase/bbui": "^1.58.7",
     "@budibase/client": "^0.7.7",
     "@budibase/colorpicker": "1.0.1",
     "@budibase/string-templates": "^0.7.7",
diff --git a/packages/builder/src/builderStore/store/backend.js b/packages/builder/src/builderStore/store/backend.js
index a5d2a81bad..4192fc7cd0 100644
--- a/packages/builder/src/builderStore/store/backend.js
+++ b/packages/builder/src/builderStore/store/backend.js
@@ -252,8 +252,8 @@ export const getBackendUiStore = () => {
             state.draftTable.primaryDisplay = field.name
           }
           // Set one-to-many
-          if (relationshipType) {
-            state.draftTable.relationshipType = field.name
+          if (field.type === 'link') {
+            state.draftTable.relationshipType = relationshipType
           }
 
           if (indexes) {
diff --git a/packages/builder/src/components/common/LinkedRowSelector.svelte b/packages/builder/src/components/common/LinkedRowSelector.svelte
index 9ac52896fb..8f7e73c9d5 100644
--- a/packages/builder/src/components/common/LinkedRowSelector.svelte
+++ b/packages/builder/src/components/common/LinkedRowSelector.svelte
@@ -31,8 +31,6 @@
   function getPrettyName(row) {
     return row[linkedTable.primaryDisplay || "_id"]
   }
-
-  $: console.log(schema.relationshipType)
 </script>
 
 {#if linkedTable.primaryDisplay == null}
diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock
index dfa3e2aba0..107b51ddd6 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.58.6":
-  version "1.58.6"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.58.6.tgz#ed74c99abdd61a2893cc30362ff893f98037fcce"
-  integrity sha512-xAKbQxucyVWLZGCaJiaacu1pyZX7vCqoPJJiQx/eF+7gX8uB1gCuzxhncM4ZaIwCCiuc51dD2Q19t3R4ObxxCA==
+"@budibase/bbui@^1.58.7":
+  version "1.58.7"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.58.7.tgz#b9ae18fbd44f830fd8b11fd1dbfaf1212243c88b"
+  integrity sha512-Kp6iNFXov5DXOTR9860kBJv4zgFEycBw13pdZgcPUERI++OWHtisEo6fuHIEfQGeALif3QEcYwaGr/6pu76C4w==
   dependencies:
     markdown-it "^12.0.2"
     quill "^1.3.7"