diff --git a/packages/api/src/controllers/apps.js b/packages/api/src/controllers/apps.js
index 462d3d4d..5b9ea438 100644
--- a/packages/api/src/controllers/apps.js
+++ b/packages/api/src/controllers/apps.js
@@ -126,7 +126,6 @@ module.exports = {
         }
       }
     }
-    console.log('APPS', apps);
     for (const folder of apps) {
       res.push(await this.loadApp({ folder }));
     }
diff --git a/packages/web/src/datagrid/ColumnHeaderControl.svelte b/packages/web/src/datagrid/ColumnHeaderControl.svelte
index 762ed303..48a0b88a 100644
--- a/packages/web/src/datagrid/ColumnHeaderControl.svelte
+++ b/packages/web/src/datagrid/ColumnHeaderControl.svelte
@@ -7,6 +7,8 @@
   import { isTypeDateTime } from 'dbgate-tools';
   import { openDatabaseObjectDetail } from '../appobj/DatabaseObjectAppObject.svelte';
   import { copyTextToClipboard } from '../utility/clipboard';
+  import VirtualForeignKeyEditorModal from '../tableeditor/VirtualForeignKeyEditorModal.svelte';
+  import { showModal } from '../modals/modalTools';
 
   export let column;
   export let conid = undefined;
@@ -26,6 +28,16 @@
     });
   };
 
+  const handleDefineVirtualForeignKey = () => {
+    showModal(VirtualForeignKeyEditorModal, {
+      schemaName: column.schemaName,
+      pureName: column.pureName,
+      conid,
+      database,
+      columnName: column.columnName,
+    });
+  };
+
   function getMenu() {
     return [
       setSort && { onClick: () => setSort('ASC'), text: 'Sort ascending' },
@@ -49,6 +61,9 @@
         { onClick: () => setGrouping('GROUP:MONTH'), text: 'Group by MONTH' },
         { onClick: () => setGrouping('GROUP:DAY'), text: 'Group by DAY' },
       ],
+
+      { divider: true },
+      { onClick: handleDefineVirtualForeignKey, text: 'Define virtual foreign key' },
     ];
   }
 </script>
diff --git a/packages/web/src/tableeditor/VirtualForeignKeyEditorModal.svelte b/packages/web/src/tableeditor/VirtualForeignKeyEditorModal.svelte
new file mode 100644
index 00000000..cf01b4c7
--- /dev/null
+++ b/packages/web/src/tableeditor/VirtualForeignKeyEditorModal.svelte
@@ -0,0 +1,183 @@
+<script lang="ts">
+  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import uuidv1 from 'uuid/v1';
+
+  import FormSelectField from '../forms/FormSelectField.svelte';
+  import FormTextField from '../forms/FormTextField.svelte';
+  import FormCheckboxField from '../forms/FormCheckboxField.svelte';
+
+  import FormProvider from '../forms/FormProvider.svelte';
+  import FormSubmit from '../forms/FormSubmit.svelte';
+  import ModalBase from '../modals/ModalBase.svelte';
+  import { closeCurrentModal } from '../modals/modalTools';
+  import ElectronFilesInput from '../impexp/ElectronFilesInput.svelte';
+  import DropDownButton from '../elements/DropDownButton.svelte';
+  import DataTypeEditor from './DataTypeEditor.svelte';
+  import {
+    editorAddConstraint,
+    editorDeleteConstraint,
+    editorModifyConstraint,
+    fullNameFromString,
+    fullNameToLabel,
+    fullNameToString,
+  } from 'dbgate-tools';
+  import TextField from '../forms/TextField.svelte';
+  import SelectField from '../forms/SelectField.svelte';
+  import _ from 'lodash';
+  import { useDatabaseInfo, useTableInfo } from '../utility/metadataLoaders';
+  import { onMount } from 'svelte';
+
+  export let conid;
+  export let database;
+  export let schemaName;
+  export let pureName;
+  export let columnName;
+
+  const dbInfo = useDatabaseInfo({ conid, database });
+  const tableInfo = useTableInfo({ conid, database, schemaName, pureName });
+
+  let columns = [];
+  let refTableName = null;
+  let refSchemaName = null;
+
+  $: refTableInfo =
+    $dbInfo?.tables?.find(x => x.pureName == refTableName && x.schemaName == refSchemaName) ||
+    $dbInfo?.views?.find(x => x.pureName == refTableName && x.schemaName == refSchemaName);
+
+  onMount(() => {
+    if (columnName) {
+      columns = [
+        ...columns,
+        {
+          columnName,
+        },
+      ];
+    }
+  });
+</script>
+
+<FormProvider>
+  <ModalBase {...$$restProps}>
+    <svelte:fragment slot="header">Virtual foreign key</svelte:fragment>
+
+    <div class="largeFormMarker">
+      <div class="row">
+        <div class="label col-3">Referenced table</div>
+        <div class="col-9">
+          <SelectField
+            value={fullNameToString({ pureName: refTableName, schemaName: refSchemaName })}
+            isNative
+            notSelected
+            options={[...($dbInfo?.tables || []), ...($dbInfo?.views || [])].map(tbl => ({
+              label: fullNameToLabel(tbl),
+              value: fullNameToString(tbl),
+            }))}
+            on:change={e => {
+              if (e.detail) {
+                const name = fullNameFromString(e.detail);
+                refTableName = name.pureName;
+                refSchemaName = name.schemaName;
+              }
+            }}
+          />
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col-5 mr-1">
+          Base column - {$tableInfo.pureName}
+        </div>
+        <div class="col-5 ml-1">
+          Ref column - {refTableName || '(table not set)'}
+        </div>
+      </div>
+
+      {#each columns as column, index}
+        <div class="row">
+          <div class="col-5 mr-1">
+            {#key column.columnName}
+              <SelectField
+                value={column.columnName}
+                isNative
+                notSelected
+                options={$tableInfo.columns.map(col => ({
+                  label: col.columnName,
+                  value: col.columnName,
+                }))}
+                on:change={e => {
+                  if (e.detail) {
+                    columns = columns.map((col, i) => (i == index ? { ...col, columnName: e.detail } : col));
+                  }
+                }}
+              />
+            {/key}
+          </div>
+          <div class="col-5 ml-1">
+            {#key column.refColumnName}
+              <SelectField
+                value={column.refColumnName}
+                isNative
+                notSelected
+                options={(refTableInfo?.columns || []).map(col => ({
+                  label: col.columnName,
+                  value: col.columnName,
+                }))}
+                on:change={e => {
+                  if (e.detail) {
+                    columns = columns.map((col, i) => (i == index ? { ...col, refColumnName: e.detail } : col));
+                  }
+                }}
+              />
+            {/key}
+          </div>
+          <div class="col-2 button">
+            <FormStyledButton
+              value="Delete"
+              on:click={e => {
+                const x = [...columns];
+                x.splice(index, 1);
+                columns = x;
+              }}
+            />
+          </div>
+        </div>
+      {/each}
+    </div>
+
+    <FormStyledButton
+      type="button"
+      value="Add column"
+      on:click={() => {
+        columns = [...columns, {}];
+      }}
+    />
+
+    <svelte:fragment slot="footer">
+      <FormSubmit
+        value={'Save'}
+        on:click={() => {
+          closeCurrentModal();
+        }}
+      />
+
+      <FormStyledButton type="button" value="Close" on:click={closeCurrentModal} />
+    </svelte:fragment>
+  </ModalBase>
+</FormProvider>
+
+<style>
+  .row {
+    margin: var(--dim-large-form-margin);
+    display: flex;
+  }
+
+  .row .label {
+    white-space: nowrap;
+    align-self: center;
+  }
+
+  .button {
+    align-self: center;
+    text-align: right;
+  }
+</style>