diff --git a/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel.tsx b/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel.tsx
index 61e7634511..42df480858 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectViewerPanel.tsx
@@ -69,7 +69,7 @@ export const ObjectViewerPanel: TabHandlerPanelComponent<IObjectViewerTabState>
         tab.handlerState.tabTitle = data.name;
       });
     },
-    active: !state.notFound,
+    active: !state.notFound && connection.data?.connected,
   });
 
   const pages = dbObjectPagesService.orderedPages;