diff --git a/packages/builder/package.json b/packages/builder/package.json
index 6c023efd29..9754c9173b 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -63,7 +63,7 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.52.2",
+    "@budibase/bbui": "^1.52.4",
     "@budibase/client": "^0.4.2",
     "@budibase/colorpicker": "^1.0.1",
     "@budibase/svelte-ag-grid": "^0.0.16",
diff --git a/packages/builder/src/analytics.js b/packages/builder/src/analytics.js
index a7166f00f6..f59d71ac30 100644
--- a/packages/builder/src/analytics.js
+++ b/packages/builder/src/analytics.js
@@ -39,19 +39,22 @@ function identify(id) {
 
 async function identifyByApiKey(apiKey) {
   if (!analyticsEnabled) return true
-  const response = await fetch(
-    `https://03gaine137.execute-api.eu-west-1.amazonaws.com/prod/account/id?api_key=${apiKey.trim()}`
-  )
+  try {
+    const response = await fetch(
+      `https://03gaine137.execute-api.eu-west-1.amazonaws.com/prod/account/id?api_key=${apiKey.trim()}`
+    )
+    if (response.status === 200) {
+      const id = await response.json()
 
-  if (response.status === 200) {
-    const id = await response.json()
+      await api.put("/api/keys/userId", { value: id })
+      identify(id)
+      return true
+    }
 
-    await api.put("/api/keys/userId", { value: id })
-    identify(id)
-    return true
+    return false
+  } catch (error) {
+    console.log(error)
   }
-
-  return false
 }
 
 function captureException(err) {
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
index 050c7ce200..1bff069b95 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
@@ -45,3 +45,9 @@
     </div>
   {/each}
 </ModalContent>
+
+<style>
+  div {
+    min-width: 0;
+  }
+</style>
diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock
index 7f650a83bc..f2f7363669 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.52.2":
-  version "1.52.2"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.52.2.tgz#a0774880fb755eb81c762bc355550af7f4562b09"
-  integrity sha512-PxiN5xvr+Z/RpypMDYh3lNhCUnejH1moMoWW7PiuCiho5VXGauR+M8T49p5eTKoFSqRMC7BUdFJJ9ye/cnQxNA==
+"@budibase/bbui@^1.52.4":
+  version "1.52.4"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.52.4.tgz#ae3c17e1f49f14e65831703958bcddc6e64afd24"
+  integrity sha512-/wiv5dSyvXLgy2/zGEslnCsjwE8qqng1D8k5ScSOPEyMab8tzzd1XxfZAN9rp84zIMgAXeH6s5a4j4riR+jVkg==
   dependencies:
     markdown-it "^12.0.2"
     quill "^1.3.7"
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 21b080da4b..6da7bc4733 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -33,7 +33,7 @@
   "license": "MIT",
   "gitHead": "284cceb9b703c38566c6e6363c022f79a08d5691",
   "dependencies": {
-    "@budibase/bbui": "^1.52.1",
+    "@budibase/bbui": "^1.52.4",
     "@budibase/svelte-ag-grid": "^0.0.16",
     "@fortawesome/fontawesome-free": "^5.14.0",
     "apexcharts": "^3.22.1",
diff --git a/packages/standard-components/yarn.lock b/packages/standard-components/yarn.lock
index 2e0a12c25a..507dd84674 100644
--- a/packages/standard-components/yarn.lock
+++ b/packages/standard-components/yarn.lock
@@ -39,10 +39,10 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@budibase/bbui@^1.52.1":
-  version "1.52.1"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.52.1.tgz#7f1612616205debeac0c65242b4856cce07e4cd0"
-  integrity sha512-950HXR4Z8b0TgJH3Dt7gLgeHlgtBVMTtG+KkFTtID/zeiXohf60wr2cyAuttCZ3yb4rFRHC+SDXo2NOsKdenKw==
+"@budibase/bbui@^1.52.4":
+  version "1.52.4"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.52.4.tgz#ae3c17e1f49f14e65831703958bcddc6e64afd24"
+  integrity sha512-/wiv5dSyvXLgy2/zGEslnCsjwE8qqng1D8k5ScSOPEyMab8tzzd1XxfZAN9rp84zIMgAXeH6s5a4j4riR+jVkg==
   dependencies:
     markdown-it "^12.0.2"
     quill "^1.3.7"