diff --git a/packages/web/src/appobj/ConnectionAppObject.svelte b/packages/web/src/appobj/ConnectionAppObject.svelte
index b52d2fa5f..d3e94e020 100644
--- a/packages/web/src/appobj/ConnectionAppObject.svelte
+++ b/packages/web/src/appobj/ConnectionAppObject.svelte
@@ -1,5 +1,5 @@
 <script context="module">
-  const getContextMenu = (data, $openedConnections) => () => {
+  const getContextMenu = (data, $openedConnections, $extensions) => () => {
     const config = getCurrentConfig();
     const handleRefresh = () => {
       axiosInstance.post('server-connections/refresh', { conid: data._id });
@@ -55,24 +55,27 @@
           onClick: handleDelete,
         },
       ],
-      !$openedConnections.includes(data._id) && {
-        text: 'Connect',
-        onClick: handleConnect,
-      },
-      { onClick: handleNewQuery, text: 'New query' },
-      $openedConnections.includes(data._id) &&
-        data.status && {
-          text: 'Refresh',
-          onClick: handleRefresh,
+      !data.singleDatabase && [
+        !$openedConnections.includes(data._id) && {
+          text: 'Connect',
+          onClick: handleConnect,
         },
-      $openedConnections.includes(data._id) && {
-        text: 'Disconnect',
-        onClick: handleDisconnect,
-      },
-      $openedConnections.includes(data._id) && {
-        text: 'Create database',
-        onClick: handleCreateDatabase,
-      },
+        { onClick: handleNewQuery, text: 'New query' },
+        $openedConnections.includes(data._id) &&
+          data.status && {
+            text: 'Refresh',
+            onClick: handleRefresh,
+          },
+        $openedConnections.includes(data._id) && {
+          text: 'Disconnect',
+          onClick: handleDisconnect,
+        },
+        $openedConnections.includes(data._id) && {
+          text: 'Create database',
+          onClick: handleCreateDatabase,
+        },
+      ],
+      data.singleDatabase && [{ divider: true }, getDatabaseMenuItems(data, data.defaultDatabase, $extensions)],
     ];
   };
 
@@ -91,6 +94,7 @@
   import ConfirmModal from '../modals/ConfirmModal.svelte';
   import InputTextModal from '../modals/InputTextModal.svelte';
   import openNewTab from '../utility/openNewTab';
+  import { getDatabaseMenuItems } from './DatabaseAppObject.svelte';
 
   export let data;
 
@@ -149,13 +153,20 @@
 <AppObjectCore
   {...$$restProps}
   {data}
-  title={data.displayName || data.server}
-  icon="img server"
-  isBold={_.get($currentDatabase, 'connection._id') == data._id}
+  title={data.singleDatabase
+    ? data.displayName || `${data.defaultDatabase} on ${data.server}`
+    : data.displayName || data.server}
+  icon={data.singleDatabase ? 'img database' : 'img server'}
+  isBold={data.singleDatabase
+    ? _.get($currentDatabase, 'connection._id') == data._id && _.get($currentDatabase, 'name') == data.defaultDatabase
+    : _.get($currentDatabase, 'connection._id') == data._id}
   statusIcon={statusIcon || engineStatusIcon}
   statusTitle={statusTitle || engineStatusTitle}
   {extInfo}
-  menu={getContextMenu(data, $openedConnections)}
-  on:click={() => ($openedConnections = _.uniq([...$openedConnections, data._id]))}
+  menu={getContextMenu(data, $openedConnections, $extensions)}
+  on:click={() => {
+    if (data.singleDatabase) $currentDatabase = { connection: data, name: data.defaultDatabase };
+    else $openedConnections = _.uniq([...$openedConnections, data._id]);
+  }}
   on:click
 />
diff --git a/packages/web/src/appobj/DatabaseAppObject.svelte b/packages/web/src/appobj/DatabaseAppObject.svelte
index 28662994e..de0e197c1 100644
--- a/packages/web/src/appobj/DatabaseAppObject.svelte
+++ b/packages/web/src/appobj/DatabaseAppObject.svelte
@@ -1,5 +1,57 @@
 <script lang="ts" context="module">
   export const extractKey = props => props.name;
+
+  export function getDatabaseMenuItems(connection, name, $extensions) {
+    const handleNewQuery = () => {
+      const tooltip = `${connection.displayName || connection.server}\n${name}`;
+      openNewTab({
+        title: 'Query #',
+        icon: 'img sql-file',
+        tooltip,
+        tabComponent: 'QueryTab',
+        props: {
+          conid: connection._id,
+          database: name,
+        },
+      });
+    };
+
+    const handleImport = () => {
+      showModal(ImportExportModal, {
+        initialValues: {
+          sourceStorageType: getDefaultFileFormat($extensions).storageType,
+          targetStorageType: 'database',
+          targetConnectionId: connection._id,
+          targetDatabaseName: name,
+        },
+      });
+    };
+
+    const handleExport = () => {
+      showModal(ImportExportModal, {
+        initialValues: {
+          targetStorageType: getDefaultFileFormat($extensions).storageType,
+          sourceStorageType: 'database',
+          sourceConnectionId: connection._id,
+          sourceDatabaseName: name,
+        },
+      });
+    };
+
+    const handleSqlGenerator = () => {
+      showModal(SqlGeneratorModal, {
+        conid: connection._id,
+        database: name,
+      });
+    };
+
+    return [
+      { onClick: handleNewQuery, text: 'New query' },
+      { onClick: handleImport, text: 'Import' },
+      { onClick: handleExport, text: 'Export' },
+      { onClick: handleSqlGenerator, text: 'SQL Generator' },
+    ];
+  }
 </script>
 
 <script lang="ts">
@@ -13,63 +65,8 @@
   import AppObjectCore from './AppObjectCore.svelte';
   export let data;
 
-  const handleNewQuery = () => {
-    const { connection, name } = data;
-    const tooltip = `${connection.displayName || connection.server}\n${name}`;
-    openNewTab({
-      title: 'Query #',
-      icon: 'img sql-file',
-      tooltip,
-      tabComponent: 'QueryTab',
-      props: {
-        conid: connection._id,
-        database: name,
-      },
-    });
-  };
-
-  const handleImport = () => {
-    const { connection, name } = data;
-
-    showModal(ImportExportModal, {
-      initialValues: {
-        sourceStorageType: getDefaultFileFormat($extensions).storageType,
-        targetStorageType: 'database',
-        targetConnectionId: connection._id,
-        targetDatabaseName: name,
-      },
-    });
-  };
-
-  const handleExport = () => {
-    const { connection, name } = data;
-
-    showModal(ImportExportModal, {
-      initialValues: {
-        targetStorageType: getDefaultFileFormat($extensions).storageType,
-        sourceStorageType: 'database',
-        sourceConnectionId: connection._id,
-        sourceDatabaseName: name,
-      },
-    });
-  };
-
-  const handleSqlGenerator = () => {
-    const { connection, name } = data;
-
-    showModal(SqlGeneratorModal, {
-      conid: connection._id,
-      database: name,
-    });
-  };
-
   function createMenu() {
-    return [
-      { onClick: handleNewQuery, text: 'New query' },
-      { onClick: handleImport, text: 'Import' },
-      { onClick: handleExport, text: 'Export' },
-      { onClick: handleSqlGenerator, text: 'SQL Generator' },
-    ];
+    return getDatabaseMenuItems(data.connection, data.name, $extensions);
   }
 </script>
 
diff --git a/packages/web/src/modals/ConnectionModalDriverFields.svelte b/packages/web/src/modals/ConnectionModalDriverFields.svelte
index 4bf262ed8..f8bffb91f 100644
--- a/packages/web/src/modals/ConnectionModalDriverFields.svelte
+++ b/packages/web/src/modals/ConnectionModalDriverFields.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+  import FormCheckboxField from '../forms/FormCheckboxField.svelte';
+
   import FormPasswordField from '../forms/FormPasswordField.svelte';
 
   import { getFormContext } from '../forms/FormProviderCore.svelte';
@@ -17,6 +19,7 @@
   $: currentAuthType = $authTypes && $authTypes.find(x => x.name == authType);
   $: disabledFields = (currentAuthType ? currentAuthType.disabledFields : null) || [];
   $: driver = $extensions.drivers.find(x => x.engine == engine);
+  $: defaultDatabase = $values.defaultDatabase;
 </script>
 
 <FormSelectField
@@ -44,11 +47,7 @@
 {/if}
 
 {#if driver?.supportsDatabaseUrl && useDatabaseUrl}
-  <FormTextField
-    label="Database URL"
-    name="databaseUrl"
-    placeholder={driver?.databaseUrlPlaceholder}
-  />
+  <FormTextField label="Database URL" name="databaseUrl" placeholder={driver?.databaseUrlPlaceholder} />
 {:else}
   {#if $authTypes}
     <FormSelectField
@@ -114,6 +113,10 @@
 
 <FormTextField label="Default database" name="defaultDatabase" />
 
+{#if defaultDatabase}
+  <FormCheckboxField label={`Use only database ${defaultDatabase}`} name="singleDatabase" />
+{/if}
+
 <FormTextField label="Display name" name="displayName" />
 
 <style>
diff --git a/packages/web/src/widgets/ConnectionList.svelte b/packages/web/src/widgets/ConnectionList.svelte
index 043ec6ed8..2d40d304f 100644
--- a/packages/web/src/widgets/ConnectionList.svelte
+++ b/packages/web/src/widgets/ConnectionList.svelte
@@ -40,7 +40,7 @@
     module={connectionAppObject}
     subItemsComponent={SubDatabaseList}
     expandOnClick
-    isExpandable={data => $openedConnections.includes(data._id)}
+    isExpandable={data => $openedConnections.includes(data._id) && !data.singleDatabase}
     {filter}
   />
   {#if $connections && $connections.length == 0 && $commandsCustomized['new.connection']?.enabled}