diff --git a/packages/api/src/controllers/sqlgen.js b/packages/api/src/controllers/sqlgen.js
index a7756a8d4..f065a70db 100644
--- a/packages/api/src/controllers/sqlgen.js
+++ b/packages/api/src/controllers/sqlgen.js
@@ -11,9 +11,9 @@ module.exports = {
     const structure = await databaseConnections.structure({ conid, database })
     const connection = await connections.get({ conid })
     const driver = requireEngineDriver(connection);
-    const dmp = driver.createDumper()
+    const dmp = driver.createDumper();
     const generator = new SqlGenerator(structure, options, objects, dmp);
-    generator.dump();
+    await generator.dump();
     return dmp.s;
   },
 };
diff --git a/packages/tools/src/SqlGenerator.ts b/packages/tools/src/SqlGenerator.ts
index ab5a0791a..b1fc11b63 100644
--- a/packages/tools/src/SqlGenerator.ts
+++ b/packages/tools/src/SqlGenerator.ts
@@ -43,7 +43,7 @@ export class SqlGenerator {
     return false;
   }
 
-  dump() {
+  async dump() {
     if (this.options.createTables) {
       for (const table of this.tables) {
         this.dmp.createTable(table);
diff --git a/packages/web/src/modals/SqlGeneratorModal.svelte b/packages/web/src/modals/SqlGeneratorModal.svelte
index 9d2a0601c..e2c4a4e8d 100644
--- a/packages/web/src/modals/SqlGeneratorModal.svelte
+++ b/packages/web/src/modals/SqlGeneratorModal.svelte
@@ -53,10 +53,12 @@
   );
 
   async function generatePreview(options, objects) {
+    busy = true;
     const response = await axiosInstance.post('sqlgen/preview', { conid, database, objects, options });
     if (_.isString(response.data)) {
       sqlPreview = response.data;
     }
+    busy = false;
   }
 </script>