diff --git a/packages/api/.env b/packages/api/.env
index acb9ad172..e0a3930f9 100644
--- a/packages/api/.env
+++ b/packages/api/.env
@@ -5,19 +5,11 @@ SERVER_mysql=localhost
 USER_mysql=root
 PASSWORD_mysql=test
 PORT_mysql=3307
-ENGINE_mysql=mysql
+ENGINE_mysql=mysql@dbgate-plugin-mysql
 
 LABEL_postgres=Postgres localhost
 SERVER_postgres=localhost
 USER_postgres=postgres
 PASSWORD_postgres=test
 PORT_postgres=5433
-ENGINE_postgres=postgres
-
-TOOLBAR=home
-ICON_home=mdi mdi-home
-TITLE_home=Home
-PAGE_home=home.html
-STARTUP_PAGES=home
-
-PAGES_DIRECTORY=/home/jena/jenasoft/dbgate-web/pages
+ENGINE_postgres=postgres@dbgate-plugin-postgres
diff --git a/packages/web/src/App.svelte b/packages/web/src/App.svelte
index dc483c3c1..f98161849 100644
--- a/packages/web/src/App.svelte
+++ b/packages/web/src/App.svelte
@@ -4,9 +4,11 @@
   import PluginsProvider from './plugins/PluginsProvider.svelte';
   import Screen from './Screen.svelte';
   import ErrorHandler from './utility/ErrorHandler.svelte';
+  import OpenTabsOnStartup from './utility/OpenTabsOnStartup.svelte';
 </script>
 
 <ErrorHandler />
 <PluginsProvider />
 <CommandListener />
+<OpenTabsOnStartup />
 <Screen />
diff --git a/packages/web/src/utility/OpenTabsOnStartup.svelte b/packages/web/src/utility/OpenTabsOnStartup.svelte
new file mode 100644
index 000000000..9f7c743a9
--- /dev/null
+++ b/packages/web/src/utility/OpenTabsOnStartup.svelte
@@ -0,0 +1,29 @@
+<script lang="ts">
+  import { onMount } from 'svelte';
+  import { openFavorite } from '../appobj/FavoriteFileAppObject.svelte';
+  import { openedTabs } from '../stores';
+
+  import { useFavorites } from './metadataLoaders';
+
+  $: favorites = useFavorites();
+  let opened = false;
+
+  onMount(() => {
+    openOnStartup($favorites);
+  });
+
+  $: openOnStartup($favorites);
+
+  function openOnStartup(list) {
+    if (!list) return;
+    if (opened) return;
+
+    opened = true;
+
+    if ($openedTabs.find(x => !x.closedTime)) return;
+
+    for (const favorite of list.filter(x => x.openOnStartup)) {
+      openFavorite(favorite);
+    }
+  }
+</script>