diff --git a/packages/web/src/modals/ConnectionModal.svelte b/packages/web/src/modals/ConnectionModal.svelte
index 13033444e..120b03f7f 100644
--- a/packages/web/src/modals/ConnectionModal.svelte
+++ b/packages/web/src/modals/ConnectionModal.svelte
@@ -20,6 +20,7 @@
   import FormProviderCore from '../forms/FormProviderCore.svelte';
   import { extensions } from '../stores';
   import _ from 'lodash';
+  import { getDatabaseFileLabel } from '../utility/getConnectionLabel';
 
   export let connection;
 
@@ -54,6 +55,7 @@
       ? {
           ..._.omit(e.detail, ['server', 'port', 'defaultDatabase']),
           singleDatabase: true,
+          defaultDatabase: getDatabaseFileLabel(e.detail.databaseFile),
         }
       : {
           ..._.omit(e.detail, ['databaseFile']),
diff --git a/packages/web/src/utility/getConnectionLabel.ts b/packages/web/src/utility/getConnectionLabel.ts
index 403abe141..f2b578ddd 100644
--- a/packages/web/src/utility/getConnectionLabel.ts
+++ b/packages/web/src/utility/getConnectionLabel.ts
@@ -1,3 +1,10 @@
+export function getDatabaseFileLabel(databaseFile) {
+  if (!databaseFile) return databaseFile;
+  const m = databaseFile.match(/[\/]([^\/]+)$/);
+  if (m) return m[1];
+  return databaseFile;
+}
+
 export default function getConnectionLabel(connection, { allowExplicitDatabase = true } = {}) {
   if (!connection) {
     return null;
@@ -9,9 +16,7 @@ export default function getConnectionLabel(connection, { allowExplicitDatabase =
     return `${connection.defaultDatabase} on ${connection.server}`;
   }
   if (connection.databaseFile) {
-    const m = connection.databaseFile.match(/[\/]([^\/]+)$/);
-    if (m) return m[1];
-    return connection.databaseFile;
+    return getDatabaseFileLabel(connection.databaseFile);
   }
   if (connection.server) {
     return connection.server;
diff --git a/packages/web/src/widgets/ConnectionList.svelte b/packages/web/src/widgets/ConnectionList.svelte
index 2d40d304f..dd912072b 100644
--- a/packages/web/src/widgets/ConnectionList.svelte
+++ b/packages/web/src/widgets/ConnectionList.svelte
@@ -12,6 +12,7 @@
   import axiosInstance from '../utility/axiosInstance';
   import ToolbarButton from './ToolbarButton.svelte';
   import runCommand from '../commands/runCommand';
+  import getConnectionLabel from '../utility/getConnectionLabel';
 
   const connections = useConnectionList();
   const serverStatus = useServerStatus();
@@ -36,7 +37,7 @@
 </SearchBoxWrapper>
 <WidgetsInnerContainer>
   <AppObjectList
-    list={_.sortBy(connectionsWithStatus, ({ displayName, server }) => (displayName || server || '').toUpperCase())}
+    list={_.sortBy(connectionsWithStatus, connection => (getConnectionLabel(connection) || '').toUpperCase())}
     module={connectionAppObject}
     subItemsComponent={SubDatabaseList}
     expandOnClick