diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/oss-flow.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/oss-flow.tsx
index ccb1eeec..04a0a505 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/oss-flow.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/oss-flow.tsx
@@ -216,7 +216,7 @@ export function OssFlow() {
       <ContextMenu isOpen={isContextMenuOpen} onHide={hideContextMenu} {...menuProps} />
 
       <ToolbarOssGraph
-        className='absolute z-pop top-8 right-1/2 translate-x-1/2'
+        className='cc-tab-tools'
         onCreateBlock={handleCreateBlock}
         onCreateSchema={handleCreateSchema}
         onImportSchema={handleImportSchema}
diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/toolbar-oss-graph.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/toolbar-oss-graph.tsx
index f4f84f23..8e0a85c9 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/toolbar-oss-graph.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/toolbar-oss-graph.tsx
@@ -113,7 +113,7 @@ export function ToolbarOssGraph({
   return (
     <div
       className={cn(
-        'flex flex-col items-center pt-1',
+        'cc-tab-tools flex flex-col items-center',
         'rounded-b-2xl',
         'hover:bg-background backdrop-blur-xs',
         className
diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/oss-edit-context.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/oss-edit-context.tsx
index df790c13..d6855afe 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/oss-edit-context.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/oss-edit-context.tsx
@@ -24,6 +24,7 @@ interface IOssEditContext {
   canDeleteOperation: (target: IOperation) => boolean;
   deleteSchema: () => void;
   setSelected: React.Dispatch<React.SetStateAction<string[]>>;
+  deselectAll: () => void;
 }
 
 export const OssEditContext = createContext<IOssEditContext | null>(null);
diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/oss-edit-state.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/oss-edit-state.tsx
index cc03872b..7d501117 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/oss-edit-state.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/oss-edit-state.tsx
@@ -110,7 +110,8 @@ export const OssEditState = ({ itemID, children }: React.PropsWithChildren<OssEd
 
         canDeleteOperation,
         deleteSchema,
-        setSelected
+        setSelected,
+        deselectAll: () => setSelected([])
       }}
     >
       {children}
diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/oss-tabs.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/oss-tabs.tsx
index 75aa1899..ce93b880 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/oss-tabs.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/oss-tabs.tsx
@@ -18,7 +18,7 @@ interface OssTabsProps {
 
 export function OssTabs({ activeTab }: OssTabsProps) {
   const router = useConceptNavigation();
-  const { schema, navigateTab } = useOssEdit();
+  const { schema, navigateTab, deselectAll } = useOssEdit();
 
   const hideFooter = useAppLayoutStore(state => state.hideFooter);
 
@@ -50,6 +50,7 @@ export function OssTabs({ activeTab }: OssTabsProps) {
         }
       }
     }
+    deselectAll();
     navigateTab(index as OssTabID);
   }
 
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/tg-flow.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/tg-flow.tsx
index 7e3b01c0..5d3fd929 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/tg-flow.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-term-graph/tg-flow.tsx
@@ -166,7 +166,7 @@ export function TGFlow() {
 
   return (
     <div className='relative' tabIndex={-1} onKeyDown={handleKeyDown}>
-      <div className='cc-tab-tools flex flex-col items-center rounded-b-2xl backdrop-blur-xs'>
+      <div className='flex flex-col items-center rounded-b-2xl backdrop-blur-xs'>
         <ToolbarTermGraph />
         <ToolbarFocusedCst focus={focusCst} resetFocus={() => setFocus(null)} />
         {!focusCst ? (