diff --git a/packages/builder/package.json b/packages/builder/package.json
index f851189969..44dd51527f 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -63,7 +63,7 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.58.1",
+    "@budibase/bbui": "^1.58.2",
     "@budibase/client": "^0.7.5",
     "@budibase/colorpicker": "1.0.1",
     "@budibase/string-templates": "^0.7.5",
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
index 1bbaddf5ef..0331f8ed3b 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
@@ -66,22 +66,4 @@
   div.icon i {
     font-size: 16px;
   }
-
-  .actions {
-    padding: var(--spacing-xl);
-    display: grid;
-    grid-gap: var(--spacing-xl);
-    min-width: 400px;
-  }
-
-  h5 {
-    margin: 0;
-    font-weight: 500;
-  }
-
-  footer {
-    display: flex;
-    justify-content: flex-end;
-    gap: var(--spacing-m);
-  }
 </style>
diff --git a/packages/builder/src/components/common/NavItem.svelte b/packages/builder/src/components/common/NavItem.svelte
index 972427328b..0f000d7ca8 100644
--- a/packages/builder/src/components/common/NavItem.svelte
+++ b/packages/builder/src/components/common/NavItem.svelte
@@ -60,6 +60,7 @@
   }
   .nav-item:hover .actions {
     display: flex;
+    visibility: visible;
   }
   .nav-item:hover,
   .nav-item.selected {
@@ -105,7 +106,7 @@
   }
 
   .actions {
-    display: none;
+    visibility: hidden;
     width: 20px;
     height: 20px;
     cursor: pointer;
diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock
index de95887104..350c4e5623 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.1":
-  version "1.58.1"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.58.1.tgz#546055cc649041724bc280594ea53e133023856f"
-  integrity sha512-XUgcsn0CLpfCeETJXoprKrn4jGlM++X6/AJX8IwDn4OSjs8i+GRzXc5shAeqLWsGXJ7S4G6fpm3bK5wk08iJmg==
+"@budibase/bbui@^1.58.2":
+  version "1.58.2"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.58.2.tgz#1b9a5b1bf20597c1ea85ebba69acfec01ef6edce"
+  integrity sha512-Gn4yCNpoVhtVhRDuWEYdaBK/oAfccTvehywgbyH4sHKaY7aQ7v0679nsJsOHBjNPleKy5YN3ZLhneh5k3F1O2Q==
   dependencies:
     markdown-it "^12.0.2"
     quill "^1.3.7"