diff --git a/frontend/src/components/shared/QuickAccessBar.tsx b/frontend/src/components/shared/QuickAccessBar.tsx
index 4dc570772..f6867cd9d 100644
--- a/frontend/src/components/shared/QuickAccessBar.tsx
+++ b/frontend/src/components/shared/QuickAccessBar.tsx
@@ -22,7 +22,7 @@ const QuickAccessBar = forwardRef<HTMLDivElement>(({
 }, ref) => {
   const { isRainbowMode } = useRainbowThemeContext();
   const { openFilesModal, isFilesModalOpen } = useFilesModalContext();
-  const { handleReaderToggle, selectedTool, leftPanelView } = useToolWorkflow();
+  const { handleReaderToggle, selectedTool, selectedToolKey, leftPanelView } = useToolWorkflow();
   const [configModalOpen, setConfigModalOpen] = useState(false);
   const [activeButton, setActiveButton] = useState<string>('tools');
   const scrollableRef = useRef<HTMLDivElement>(null);
@@ -31,7 +31,7 @@ const QuickAccessBar = forwardRef<HTMLDivElement>(({
   // Sync left nav highlight with selected tool when appropriate
   useEffect(() => {
     if (leftPanelView === 'toolContent' && selectedTool) {
-      const target = getTargetNavButton(selectedTool);
+      const target = getTargetNavButton(selectedTool, selectedToolKey);
 
       if (target && activeButton !== target) {
         setActiveButton(target);
@@ -46,7 +46,7 @@ const QuickAccessBar = forwardRef<HTMLDivElement>(({
     if (leftPanelView !== 'toolContent') {
       setActiveButton('tools');
     }
-  }, [leftPanelView, selectedTool?.view, selectedTool?.subcategory]);
+  }, [leftPanelView, selectedTool, selectedToolKey]);
 
   const handleFilesButtonClick = () => {
     openFilesModal();
diff --git a/frontend/src/components/shared/quickAccessBar/QuickAccessBar.ts b/frontend/src/components/shared/quickAccessBar/QuickAccessBar.ts
index 1c75bc20f..be9b75ec6 100644
--- a/frontend/src/components/shared/quickAccessBar/QuickAccessBar.ts
+++ b/frontend/src/components/shared/quickAccessBar/QuickAccessBar.ts
@@ -58,13 +58,15 @@ export const getNavButtonStyle = (
 /**
  * Determine which nav button should be highlighted based on selected tool
  */
-export const getTargetNavButton = (selectedTool: any): string | null => {
-  if (!selectedTool) return null;
+export const getTargetNavButton = (selectedTool: any, selectedToolKey: string | null): string | null => {
+  if (!selectedTool || !selectedToolKey) return null;
   
-  // Map tool.view to nav button ids
-  if (selectedTool.view === 'sign') return 'sign';
-  if (selectedTool.view === 'view') return 'read';
-  // Use subcategory to infer Automate group
+  // Map specific tool keys to nav button ids
+  if (selectedToolKey === 'sign') return 'sign';
+  if (selectedToolKey === 'read') return 'read';
+  if (selectedToolKey === 'automate') return 'automate';
+  
+  // Fallback: use subcategory for automation tools
   if (selectedTool.subcategory === 'Automation') return 'automate';
   
   return null;