diff --git a/src/lib/vis/components/VisualizationTabBar.tsx b/src/lib/vis/components/VisualizationTabBar.tsx
index 5110f6b0862dacaa3617266d70c0a2ee92b5d5bd..be29baef0534b15a514909ae50cdb418e92587af 100644
--- a/src/lib/vis/components/VisualizationTabBar.tsx
+++ b/src/lib/vis/components/VisualizationTabBar.tsx
@@ -15,7 +15,6 @@ import { VisualizationsConfig } from './config';
 import { Visualizations } from './VisualizationPanel';
 import Sortable from 'sortablejs';
 import { VisualizationSettingsType } from '../common';
-import { resultSetFocus } from '@/lib/data-access/store/interactionSlice';
 
 export default function VisualizationTabBar(props: { fullSize: () => void; exportImage: () => void; handleSelect: () => void }) {
   const { activeVisualizationIndex, openVisualizationArray } = useVisualization();
@@ -107,7 +106,6 @@ export default function VisualizationTabBar(props: { fullSize: () => void; expor
                       label={displayName}
                       className="flex items-center gap-2"
                       onClick={async () => {
-                        dispatch(resultSetFocus({ focusType: 'visualization' }));
                         const component = await Visualizations[id]();
                         dispatch(addVisualization({ ...component.default.settings, name: displayName, id }));
                         setOpen(false);
diff --git a/src/lib/vis/views/Recommender.tsx b/src/lib/vis/views/Recommender.tsx
index 6d153798ebe8bfd445904d2ca30575cbab734544..cc5924fab2c1e51915a497219ec3fe8fe07c96d4 100644
--- a/src/lib/vis/views/Recommender.tsx
+++ b/src/lib/vis/views/Recommender.tsx
@@ -4,7 +4,6 @@ import { addVisualization } from '../../data-access/store/visualizationSlice';
 import { useActiveSaveStateAuthorization, useAppDispatch } from '../../data-access';
 import { Visualizations } from '../components/VisualizationPanel';
 import { VisualizationsConfig } from '../components/config/VisualizationConfig';
-import { resultSetFocus } from '@/lib/data-access/store/interactionSlice';
 
 export function Recommender() {
   const dispatch = useAppDispatch();
@@ -28,7 +27,6 @@ export function Recommender() {
                   console.debug('User blocked from editing query due to being a viewer');
                   return;
                 }
-                dispatch(resultSetFocus({ focusType: 'visualization' }));
                 const component = await Visualizations[id]();
                 dispatch(addVisualization({ ...component.default.settings, name: displayName, id }));
               }}
diff --git a/src/lib/vis/visualizations/semanticsubstratesvis/semanticsubstratesvis.tsx b/src/lib/vis/visualizations/semanticsubstratesvis/semanticsubstratesvis.tsx
index 21427cc62f455b08b0cfc70e0c6ac31d543991d6..4b3ed8b551a277d2cee07f46e9ba4c323f400df3 100644
--- a/src/lib/vis/visualizations/semanticsubstratesvis/semanticsubstratesvis.tsx
+++ b/src/lib/vis/visualizations/semanticsubstratesvis/semanticsubstratesvis.tsx
@@ -154,6 +154,30 @@ const VisSemanticSubstrates = forwardRef<VisSemanticSubstratesHandle, Visualizat
       strokeOpacity: config.edges.strokeOpacity,
     });
 
+    useEffect(() => {
+      if (settings.dataPanels.length === 0 && graphMetadata.nodes.labels.length > 0) {
+        const panels = graphMetadata.nodes.labels.map((nodeName, index) => {
+          return {
+            id: index,
+            data: {
+              entitySelected: nodeName,
+              attributeSelected: undefined,
+              attributeValueSelected: undefined,
+              xAxisSelected: undefined,
+              yAxisSelected: undefined,
+            },
+            settingsOpen: true,
+          };
+        });
+
+        const newConfiguration = {
+          ...settings,
+          dataPanels: panels,
+        };
+        updateSettings(newConfiguration);
+      }
+    }, []);
+
     const handleBrushClear = useMemo(() => {
       return (selectedElement: string): void => {
         const modifiedString: number = +selectedElement.replace('region_', '');