diff --git a/packages/web/src/utility/globalState.js b/packages/web/src/utility/globalState.js
index 8975f6528..a469046c4 100644
--- a/packages/web/src/utility/globalState.js
+++ b/packages/web/src/utility/globalState.js
@@ -95,11 +95,15 @@ export { OpenedTabsProvider, useOpenedTabs, useSetOpenedTabs };
 export function useUpdateDatabaseForTab(tabVisible, conid, database) {
   const connection = useConnectionInfo({ conid });
   const setDb = useSetCurrentDatabase();
+  const currentDb = useCurrentDatabase();
   const previousTabVisible = usePrevious(!!(tabVisible && connection));
 
   if (!conid || !database) return;
 
   if (!previousTabVisible && tabVisible && connection) {
+    if (currentDb && currentDb.connection && currentDb.connection._id == conid && currentDb.name == database) {
+      return;
+    }
     setDb({
       name: database,
       connection,
diff --git a/packages/web/src/widgets/WidgetContainer.js b/packages/web/src/widgets/WidgetContainer.js
index ebd20cc78..51ea1f4b0 100644
--- a/packages/web/src/widgets/WidgetContainer.js
+++ b/packages/web/src/widgets/WidgetContainer.js
@@ -6,7 +6,7 @@ import FavoritesWidget from './FavoritesWidget';
 import FilesWidget from './FilesWidget';
 import PluginsWidget from './PluginsWidget';
 
-export default function WidgetContainer() {
+function WidgetContainerCore() {
   const currentWidget = useCurrentWidget();
   if (currentWidget === 'database') return <DatabaseWidget />;
   if (currentWidget === 'file') return <FilesWidget />;
@@ -15,3 +15,7 @@ export default function WidgetContainer() {
   if (currentWidget === 'favorites') return <FavoritesWidget />;
   return null;
 }
+
+const WidgetContainer = React.memo(WidgetContainerCore);
+
+export default WidgetContainer;