diff --git a/package.json b/package.json
index 959b638dc..6c56445fb 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "start:api": "yarn workspace dbgate-api start | pino-pretty",
     "start:api:json": "yarn workspace dbgate-api start",
     "start:app": "cd app && yarn start | pino-pretty",
+    "start:app:singledb": "CONNECTIONS=con1 SERVER_con1=localhost ENGINE_con1=mysql@dbgate-plugin-mysql USER_con1=root PASSWORD_con1=Pwd2020Db SINGLE_CONNECTION=con1 SINGLE_DATABASE=Chinook yarn start:app",
     "start:api:debug": "cross-env DEBUG=* yarn workspace dbgate-api start",
     "start:app:debug": "cd app && cross-env DEBUG=* yarn start",
     "start:api:debug:ssh": "cross-env DEBUG=ssh yarn workspace dbgate-api start",
diff --git a/packages/web/src/modals/ConfirmSqlModal.svelte b/packages/web/src/modals/ConfirmSqlModal.svelte
index 3f6cf1a85..25f176f7d 100644
--- a/packages/web/src/modals/ConfirmSqlModal.svelte
+++ b/packages/web/src/modals/ConfirmSqlModal.svelte
@@ -47,6 +47,15 @@
   const values = writable({});
 
   // $: console.log('recreates', recreates);
+
+  $: currentScript = $values.deleteReferencesCascade
+    ? [
+        ...deleteCascadesScripts
+          .filter(({ script, title }) => $values[`deleteReferencesFor_${title}`] !== false)
+          .map(({ script, title }) => script),
+        sql,
+      ].join('\n')
+    : sql;
 </script>
 
 <FormProviderCore {values}>
@@ -54,18 +63,7 @@
     <div slot="header">Save changes</div>
 
     <div class="editor">
-      <SqlEditor
-        {engine}
-        value={$values.deleteReferencesCascade
-          ? [
-              ...deleteCascadesScripts
-                .filter(({ script, title }) => $values[`deleteReferencesFor_${title}`] !== false)
-                .map(({ script, title }) => script),
-              sql,
-            ].join('\n')
-          : sql}
-        readOnly
-      />
+      <SqlEditor {engine} value={currentScript} readOnly />
     </div>
 
     {#if !_.isEmpty(deleteCascadesScripts)}
@@ -146,16 +144,7 @@
         disabled={isRecreated && !$values.allowRecreate}
         on:click={e => {
           closeCurrentModal();
-          onConfirm(
-            e.detail.deleteReferencesCascade
-              ? [
-                  ...deleteCascadesScripts
-                    .filter(({ script, title }) => e.detail[`deleteReferencesFor_${title}`] !== false)
-                    .map(({ script, title }) => script),
-                  sql,
-                ].join('\n')
-              : null
-          );
+          onConfirm(currentScript);
         }}
       />
       <FormStyledButton type="button" value="Close" on:click={closeCurrentModal} />
@@ -164,7 +153,7 @@
         value="Open script"
         on:click={() => {
           newQuery({
-            initialData: sql,
+            initialData: currentScript,
           });
 
           closeCurrentModal();
diff --git a/packages/web/src/tabs/TableDataTab.svelte b/packages/web/src/tabs/TableDataTab.svelte
index e165f9522..ee081d40c 100644
--- a/packages/web/src/tabs/TableDataTab.svelte
+++ b/packages/web/src/tabs/TableDataTab.svelte
@@ -147,7 +147,7 @@
     } else {
       showModal(ConfirmSqlModal, {
         sql,
-        onConfirm: sqlOverride => handleConfirmSql(sqlOverride || sql),
+        onConfirm: confirmedSql => handleConfirmSql(confirmedSql),
         engine: driver.engine,
         deleteCascadesScripts,
         skipConfirmSettingKey: deleteCascadesScripts?.length ? null : 'skipConfirm.tableDataSave',