diff --git a/packages/api/src/controllers/sqlgen.js b/packages/api/src/controllers/sqlgen.js
new file mode 100644
index 000000000..a7756a8d4
--- /dev/null
+++ b/packages/api/src/controllers/sqlgen.js
@@ -0,0 +1,19 @@
+const databaseConnections = require('./databaseConnections');
+const connections = require('./connections');
+const requireEngineDriver = require('../utility/requireEngineDriver');
+const { SqlGenerator } = require('dbgate-tools')
+
+module.exports = {
+  preview_meta: {
+    method: 'post',
+  },
+  async preview({ conid, database, objects, options }) {
+    const structure = await databaseConnections.structure({ conid, database })
+    const connection = await connections.get({ conid })
+    const driver = requireEngineDriver(connection);
+    const dmp = driver.createDumper()
+    const generator = new SqlGenerator(structure, options, objects, dmp);
+    generator.dump();
+    return dmp.s;
+  },
+};
diff --git a/packages/api/src/main.js b/packages/api/src/main.js
index b96dbc809..63080f666 100644
--- a/packages/api/src/main.js
+++ b/packages/api/src/main.js
@@ -26,6 +26,7 @@ const uploads = require('./controllers/uploads');
 const plugins = require('./controllers/plugins');
 const files = require('./controllers/files');
 const scheduler = require('./controllers/scheduler');
+const sqlgen = require('./controllers/sqlgen');
 
 const { rundir } = require('./utility/directories');
 
@@ -72,6 +73,7 @@ function start(argument = null) {
   useController(app, '/plugins', plugins);
   useController(app, '/files', files);
   useController(app, '/scheduler', scheduler);
+  useController(app, '/sqlgen', sqlgen);
 
   // if (process.env.PAGES_DIRECTORY) {
   //   app.use('/pages', express.static(process.env.PAGES_DIRECTORY));
diff --git a/packages/tools/src/SqlGenerator.ts b/packages/tools/src/SqlGenerator.ts
new file mode 100644
index 000000000..ab5a0791a
--- /dev/null
+++ b/packages/tools/src/SqlGenerator.ts
@@ -0,0 +1,62 @@
+import { DatabaseInfo, FunctionInfo, ProcedureInfo, TableInfo, ViewInfo } from 'dbgate-types';
+import { SqlDumper } from './SqlDumper';
+
+interface SqlGeneratorOptions {
+  dropTables: boolean;
+  checkIfTableExists: boolean;
+  dropReferences: boolean;
+  createTables: boolean;
+  createReferences: boolean;
+  createForeignKeys: boolean;
+  createIndexes: boolean;
+  insert: boolean;
+  skipAutoincrementColumn: boolean;
+  disableConstraints: boolean;
+  omitNulls: boolean;
+  truncate: boolean;
+}
+
+interface SqlGeneratorObject {
+  schemaName: string;
+  pureName: string;
+  objectTypeField: 'tables' | 'views' | 'procedures' | 'functions';
+}
+
+export class SqlGenerator {
+  private tables: TableInfo[];
+  private views: ViewInfo[];
+  private procedures: ProcedureInfo[];
+  private functions: FunctionInfo[];
+  constructor(
+    public dbinfo: DatabaseInfo,
+    public options: SqlGeneratorOptions,
+    public objects: SqlGeneratorObject[],
+    public dmp: SqlDumper
+  ) {
+    this.tables = this.extract('tables');
+    this.views = this.extract('views');
+    this.procedures = this.extract('procedures');
+    this.functions = this.extract('functions');
+  }
+
+  checkDumper() {
+    return false;
+  }
+
+  dump() {
+    if (this.options.createTables) {
+      for (const table of this.tables) {
+        this.dmp.createTable(table);
+        if (this.checkDumper()) return;
+      }
+    }
+  }
+
+  extract(objectTypeField) {
+    return this.dbinfo[objectTypeField].filter(x =>
+      this.objects.find(
+        y => x.pureName == y.pureName && x.schemaName == y.schemaName && y.objectTypeField == objectTypeField
+      )
+    );
+  }
+}
diff --git a/packages/tools/src/index.ts b/packages/tools/src/index.ts
index 772f9e183..a5204138f 100644
--- a/packages/tools/src/index.ts
+++ b/packages/tools/src/index.ts
@@ -8,3 +8,4 @@ export * from './driverBase';
 export * from './SqlDumper';
 export * from './testPermission';
 export * from './splitPostgresQuery';
+export * from './SqlGenerator';
diff --git a/packages/web/src/appobj/AppObjectCore.svelte b/packages/web/src/appobj/AppObjectCore.svelte
index 00ff3aab2..fba5022cb 100644
--- a/packages/web/src/appobj/AppObjectCore.svelte
+++ b/packages/web/src/appobj/AppObjectCore.svelte
@@ -2,12 +2,14 @@
   import FontIcon from '../icons/FontIcon.svelte';
   import contextMenu from '../utility/contextMenu';
   import { createEventDispatcher } from 'svelte';
+  import CheckboxField from '../forms/CheckboxField.svelte';
 
   const dispatch = createEventDispatcher();
 
   export let icon;
   export let title;
   export let data;
+  export let module;
 
   export let isBold = false;
   export let isBusy = false;
@@ -16,22 +18,54 @@
   export let extInfo = undefined;
   export let menu = undefined;
   export let expandIcon = undefined;
+  export let checkedObjectsStore = null;
+
+  $: isChecked = checkedObjectsStore && $checkedObjectsStore.find(x => module.extractKey(data) == module.extractKey(x));
 
   function handleExpand() {
     dispatch('expand');
   }
+  function handleClick() {
+    if (checkedObjectsStore) {
+      if (isChecked) {
+        checkedObjectsStore.update(x => x.filter(y => module.extractKey(data) != module.extractKey(y)));
+      } else {
+        checkedObjectsStore.update(x => [...x, data]);
+      }
+    } else {
+      dispatch('click');
+    }
+  }
+
+  function setChecked(value) {
+    if (!value && isChecked) {
+      checkedObjectsStore.update(x => x.filter(y => module.extractKey(data) != module.extractKey(y)));
+    }
+    if (value && !isChecked) {
+      checkedObjectsStore.update(x => [...x, data]);
+    }
+  }
 </script>
 
 <div
   class="main"
   class:isBold
   draggable={true}
-  on:click
+  on:click={handleClick}
   use:contextMenu={menu}
   on:dragstart={e => {
     e.dataTransfer.setData('app_object_drag_data', JSON.stringify(data));
   }}
 >
+  {#if checkedObjectsStore}
+    <CheckboxField
+      checked={!!isChecked}
+      on:change={e => {
+        // @ts-ignore
+        setChecked(e.target.checked);
+      }}
+    />
+  {/if}
   {#if expandIcon}
     <span class="expand-icon" on:click|stopPropagation={handleExpand}>
       <FontIcon icon={expandIcon} />
diff --git a/packages/web/src/appobj/AppObjectGroup.svelte b/packages/web/src/appobj/AppObjectGroup.svelte
index 85a49ea70..73f3a3127 100644
--- a/packages/web/src/appobj/AppObjectGroup.svelte
+++ b/packages/web/src/appobj/AppObjectGroup.svelte
@@ -8,6 +8,7 @@
   export let group;
   export let items;
   export let module;
+  export let checkedObjectsStore = null;
 
   let isExpanded = true;
 
@@ -26,7 +27,7 @@
 
 {#if isExpanded}
   {#each filtered as item (module.extractKey(item.data))}
-    <AppObjectListItem {...$$restProps} {module} data={item.data} on:objectClick />
+    <AppObjectListItem {...$$restProps} {module} data={item.data} {checkedObjectsStore} on:objectClick />
   {/each}
 {/if}
 
diff --git a/packages/web/src/appobj/AppObjectList.svelte b/packages/web/src/appobj/AppObjectList.svelte
index 92e3e74dc..96cd10284 100644
--- a/packages/web/src/appobj/AppObjectList.svelte
+++ b/packages/web/src/appobj/AppObjectList.svelte
@@ -11,6 +11,7 @@
   export let isExpandable = undefined;
   export let filter;
   export let expandIconFunc = undefined;
+  export let checkedObjectsStore = null;
 
   export let groupFunc = undefined;
 
@@ -36,7 +37,15 @@
 
 {#if groupFunc}
   {#each _.keys(groups) as group (group)}
-    <AppObjectGroup {group} {module} items={groups[group]} {expandIconFunc} {isExpandable} {subItemsComponent} />
+    <AppObjectGroup
+      {group}
+      {module}
+      items={groups[group]}
+      {expandIconFunc}
+      {isExpandable}
+      {subItemsComponent}
+      {checkedObjectsStore}
+    />
   {/each}
 {:else}
   {#each filtered as data (module.extractKey(data))}
@@ -48,6 +57,7 @@
       {isExpandable}
       on:objectClick
       {expandIconFunc}
+      {checkedObjectsStore}
     />
   {/each}
 {/if}
diff --git a/packages/web/src/appobj/AppObjectListItem.svelte b/packages/web/src/appobj/AppObjectListItem.svelte
index 9b88412e7..a14754279 100644
--- a/packages/web/src/appobj/AppObjectListItem.svelte
+++ b/packages/web/src/appobj/AppObjectListItem.svelte
@@ -16,6 +16,7 @@
   export let expandOnClick;
   export let isExpandable = undefined;
   export let expandIconFunc = plusExpandIcon;
+  export let checkedObjectsStore = null;
 
   let isExpanded = false;
 
@@ -41,6 +42,8 @@
   on:click={handleExpand}
   on:expand={handleExpandButton}
   expandIcon={getExpandIcon(expandable, subItemsComponent, isExpanded, expandIconFunc)}
+  {checkedObjectsStore}
+  {module}
 />
 
 {#if isExpanded && subItemsComponent}
diff --git a/packages/web/src/commands/stdCommands.ts b/packages/web/src/commands/stdCommands.ts
index 85fc5bbbc..fa86e9540 100644
--- a/packages/web/src/commands/stdCommands.ts
+++ b/packages/web/src/commands/stdCommands.ts
@@ -198,11 +198,8 @@ registerCommand({
   testEnabled: () => getCurrentDatabase() != null,
   onClick: () =>
     showModal(SqlGeneratorModal, {
-      importToArchive: true,
-      initialValues: {
-        conid: getCurrentDatabase()?.connection?._id,
-        database: getCurrentDatabase()?.name,
-      },
+      conid: getCurrentDatabase()?.connection?._id,
+      database: getCurrentDatabase()?.name,
     }),
 });
 
diff --git a/packages/web/src/modals/ImportExportModal.svelte b/packages/web/src/modals/ImportExportModal.svelte
index f5bf9b1f7..b0a000bb6 100644
--- a/packages/web/src/modals/ImportExportModal.svelte
+++ b/packages/web/src/modals/ImportExportModal.svelte
@@ -162,7 +162,6 @@
 
 <style>
   .content {
-    border-top: 1px solid var(--theme-border);
     flex: 1;
     display: flex;
     flex-direction: column;
diff --git a/packages/web/src/modals/ModalBase.svelte b/packages/web/src/modals/ModalBase.svelte
index 4fcffaade..793409f88 100644
--- a/packages/web/src/modals/ModalBase.svelte
+++ b/packages/web/src/modals/ModalBase.svelte
@@ -34,7 +34,7 @@
   <!-- Modal content -->
   <div class="window" class:fullScreen use:clickOutside on:clickOutside={handleCloseModal}>
     {#if $$slots.header}
-      <div class="header">
+      <div class="header" class:fullScreen>
         <div><slot name="header" /></div>
         <div class="close" on:click={handleCloseModal}>
           <FontIcon icon="icon close" />
@@ -107,6 +107,10 @@
     background-color: var(--theme-bg-modalheader);
   }
 
+  .header.fullScreen {
+    border-bottom: 1px solid var(--theme-border);
+  }
+
   .content:not(.fullScreen) {
     border-bottom: 1px solid var(--theme-border);
     border-top: 1px solid var(--theme-border);
diff --git a/packages/web/src/modals/SqlGeneratorModal.svelte b/packages/web/src/modals/SqlGeneratorModal.svelte
index 40e0bd5b0..9d2a0601c 100644
--- a/packages/web/src/modals/SqlGeneratorModal.svelte
+++ b/packages/web/src/modals/SqlGeneratorModal.svelte
@@ -1,7 +1,27 @@
 <script lang="ts">
+  import _ from 'lodash';
+  import { writable } from 'svelte/store';
+  import AppObjectList from '../appobj/AppObjectList.svelte';
+  import * as databaseObjectAppObject from '../appobj/DatabaseObjectAppObject.svelte';
+
+  import HorizontalSplitter from '../elements/HorizontalSplitter.svelte';
+
   import LargeButton from '../elements/LargeButton.svelte';
+  import SearchBoxWrapper from '../elements/SearchBoxWrapper.svelte';
+  import SearchInput from '../elements/SearchInput.svelte';
+  import FormCheckboxField from '../forms/FormCheckboxField.svelte';
+  import FormFieldTemplateTiny from '../forms/FormFieldTemplateTiny.svelte';
+  import FormProvider from '../forms/FormProvider.svelte';
+  import FormProviderCore from '../forms/FormProviderCore.svelte';
+  import FormValues from '../forms/FormValues.svelte';
 
   import FontIcon from '../icons/FontIcon.svelte';
+  import SqlEditor from '../query/SqlEditor.svelte';
+  import axiosInstance from '../utility/axiosInstance';
+  import { useDatabaseInfo } from '../utility/metadataLoaders';
+  import WidgetColumnBar from '../widgets/WidgetColumnBar.svelte';
+  import WidgetColumnBarItem from '../widgets/WidgetColumnBarItem.svelte';
+  import WidgetsInnerContainer from '../widgets/WidgetsInnerContainer.svelte';
 
   import ModalBase from './ModalBase.svelte';
   import { closeCurrentModal } from './modalTools';
@@ -10,19 +30,113 @@
   export let database;
 
   let busy = false;
+  let managerSize;
+  let objectsFilter = '';
+  let sqlPreview = '';
+
+  const checkedObjectsStore = writable([]);
+  const valuesStore = writable({});
+
+  $: console.log('checkedObjectsStore', $checkedObjectsStore);
+
+  $: objects = useDatabaseInfo({ conid, database });
+
+  $: generatePreview($valuesStore, $checkedObjectsStore);
+
+  $: objectList = _.flatten(
+    ['tables', 'views', 'procedures', 'functions'].map(objectTypeField =>
+      _.sortBy(
+        (($objects || {})[objectTypeField] || []).map(obj => ({ ...obj, objectTypeField })),
+        ['schemaName', 'pureName']
+      )
+    )
+  );
+
+  async function generatePreview(options, objects) {
+    const response = await axiosInstance.post('sqlgen/preview', { conid, database, objects, options });
+    if (_.isString(response.data)) {
+      sqlPreview = response.data;
+    }
+  }
 </script>
 
-<ModalBase {...$$restProps} fullScreen>
-  <svelte:fragment slot="header">
-    SQL Generator
-    {#if busy}
-      <FontIcon icon="icon loading" />
-    {/if}
-  </svelte:fragment>
+<FormProviderCore values={valuesStore} template={FormFieldTemplateTiny}>
+  <ModalBase {...$$restProps} fullScreen>
+    <svelte:fragment slot="header">
+      SQL Generator
+      {#if busy}
+        <FontIcon icon="icon loading" />
+      {/if}
+    </svelte:fragment>
 
-  <svelte:fragment slot="footer">
-    <div class="flex m-2">
-      <LargeButton on:click={closeCurrentModal} icon="icon close">Close</LargeButton>
-    </div>
-  </svelte:fragment>
-</ModalBase>
+    <HorizontalSplitter initialValue="300px" bind:size={managerSize}>
+      <svelte:fragment slot="1">
+        <WidgetColumnBar>
+          <WidgetColumnBarItem title="Choose objects" name="objects" height="60%">
+            <SearchBoxWrapper>
+              <SearchInput placeholder="Search tables or objects" bind:value={objectsFilter} />
+            </SearchBoxWrapper>
+
+            <WidgetsInnerContainer>
+              <AppObjectList
+                list={objectList.map(x => ({ ...x, conid, database }))}
+                module={databaseObjectAppObject}
+                groupFunc={data => _.startCase(data.objectTypeField)}
+                isExpandable={data => data.objectTypeField == 'tables' || data.objectTypeField == 'views'}
+                filter={objectsFilter}
+                {checkedObjectsStore}
+              />
+            </WidgetsInnerContainer>
+          </WidgetColumnBarItem>
+
+          <WidgetColumnBarItem title="Settings" name="settings">
+            <WidgetsInnerContainer>
+              <FormValues let:values>
+                <FormCheckboxField label="Drop tables" name="dropTables" />
+                {#if values.dropTables}
+                  <div class="ml-1">
+                    <FormCheckboxField label="Test if exists" name="checkIfTableExists" defaultValue={true} />
+                  </div>
+                {/if}
+                <FormCheckboxField label="Drop references" name="dropReferences" />
+
+                <FormCheckboxField label="Create tables" name="createTables" />
+                <FormCheckboxField label="Create references" name="createReferences" />
+                <FormCheckboxField label="Create foreign keys" name="createForeignKeys" />
+                <FormCheckboxField label="Create indexes" name="createIndexes" />
+
+                <FormCheckboxField label="Insert" name="insert" />
+                {#if values.insert}
+                  <div class="ml-1">
+                    <FormCheckboxField label="Skip autoincrement column" name="skipAutoincrementColumn" />
+                    <FormCheckboxField label="Disable constraints" name="disableConstraints" defaultValue={true} />
+                    <FormCheckboxField label="Omit NULL values" name="omitNulls" />
+                  </div>
+                {/if}
+
+                <FormCheckboxField label="Truncate tables (delete all rows)" name="truncate" />
+
+                <!-- <HashCheckBox label='Drop' hashName={`gensql.drop${objTypePascal}`} onChange={onChange} />
+          {
+              getHashValue(`gensql.drop${objTypePascal}`) == '1' &&
+              <HashCheckBox label='Test if exists' hashName={`gensql.checkIf${objTypePascal}Exists`} indent={1} onChange={onChange} defaultChecked />
+          }
+          <HashCheckBox label='Create' hashName={`gensql.create${objTypePascal}`} onChange={onChange} /> -->
+              </FormValues>
+            </WidgetsInnerContainer>
+          </WidgetColumnBarItem>
+        </WidgetColumnBar>
+      </svelte:fragment>
+
+      <svelte:fragment slot="2">
+        <SqlEditor readOnly value={sqlPreview} />
+      </svelte:fragment>
+    </HorizontalSplitter>
+
+    <svelte:fragment slot="footer">
+      <div class="flex m-2">
+        <LargeButton on:click={closeCurrentModal} icon="icon close">Close</LargeButton>
+      </div>
+    </svelte:fragment>
+  </ModalBase>
+</FormProviderCore>