diff --git a/packages/bbui/src/Button/Button.svelte b/packages/bbui/src/Button/Button.svelte
index 67930b8030..9d815235fe 100644
--- a/packages/bbui/src/Button/Button.svelte
+++ b/packages/bbui/src/Button/Button.svelte
@@ -30,6 +30,7 @@
     {disabled}
     on:click|preventDefault
     on:mouseover={() => (showTooltip = true)}
+    on:focus={() => (showTooltip = true)}
     on:mouseleave={() => (showTooltip = false)}
   >
     {#if icon}
diff --git a/packages/builder/src/components/backend/DataTable/modals/ImportModal.svelte b/packages/builder/src/components/backend/DataTable/modals/ImportModal.svelte
index f04a6c25c9..f7bb0e3cc8 100644
--- a/packages/builder/src/components/backend/DataTable/modals/ImportModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/ImportModal.svelte
@@ -48,6 +48,3 @@
     <TableDataImport bind:dataImport bind:existingTableId={tableId} />
   </Layout>
 </ModalContent>
-
-<style>
-</style>
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/rest/auth/RestAuthenticationModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/rest/auth/RestAuthenticationModal.svelte
index 091e3e7ce6..7f0cc7357b 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/rest/auth/RestAuthenticationModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/rest/auth/RestAuthenticationModal.svelte
@@ -213,6 +213,3 @@
     {/if}
   </Layout>
 </ModalContent>
-
-<style>
-</style>
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/ImportRestQueriesModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/ImportRestQueriesModal.svelte
index 86cc25a0f3..8a34edade0 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/ImportRestQueriesModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/ImportRestQueriesModal.svelte
@@ -130,6 +130,3 @@
     </Tabs>
   </Layout>
 </ModalContent>
-
-<style>
-</style>
diff --git a/packages/builder/vite.config.js b/packages/builder/vite.config.js
index b68d265bc5..47fed87e1e 100644
--- a/packages/builder/vite.config.js
+++ b/packages/builder/vite.config.js
@@ -15,6 +15,7 @@ export default ({ mode }) => {
     build: {
       minify: isProduction,
       outDir: "../server/builder",
+      sourcemap: !isProduction,
     },
     plugins: [
       svelte({