diff --git a/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/chats-section/chats-section.tsx b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/chats-section/chats-section.tsx
index f83504cecae..2915b67c981 100644
--- a/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/chats-section/chats-section.tsx
+++ b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/chats-section/chats-section.tsx
@@ -8,6 +8,7 @@ import {
   ChatNavigationLink,
   CollapsedChatFlyoutItem,
   CollapsedSidebarMenu,
+  SidebarRowActions,
   SidebarSection,
 } from '@/app/workspace/[workspaceId]/w/components/sidebar/components'
 import { SidebarRenameRow } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-rename-row'
@@ -56,30 +57,27 @@ function ChatRow({
       href={chat.href}
       chatId={chat.id}
       isCurrentRoute={isCurrentRoute}
-      className={chipVariants({ active: isCurrentRoute || isMenuOpen, fullWidth: true })}
+      className={cn(
+        chipVariants({ active: isCurrentRoute || isMenuOpen, fullWidth: true }),
+        'group/sidebar-row'
+      )}
       onContextMenu={(e) => onContextMenu(e, chat.id)}
     >
       <OverflowText label={chat.name} className='flex-1 text-[var(--text-body)]' />
-      <div className='relative flex size-[18px] shrink-0 items-center justify-center'>
-        {showStatusDot && (
-          <span
-            aria-hidden='true'
-            className={cn(
-              'size-[6px] rounded-full transition-opacity',
-              isMenuOpen ? 'opacity-0' : 'group-focus-within:opacity-0 group-hover:opacity-0'
-            )}
-            style={{ backgroundColor: chat.isActive ? '#EAB308' : 'var(--brand-accent)' }}
-          />
-        )}
-        {!showStatusDot && chat.isPinned && (
-          <Pin
-            aria-hidden='true'
-            className={cn(
-              'absolute size-[12px] text-[var(--text-icon)] transition-opacity',
-              isMenuOpen ? 'opacity-0' : 'group-focus-within:opacity-0 group-hover:opacity-0'
-            )}
-          />
-        )}
+      <SidebarRowActions
+        open={isMenuOpen}
+        indicator={
+          showStatusDot ? (
+            <span
+              aria-hidden='true'
+              className='size-[6px] rounded-full'
+              style={{ backgroundColor: chat.isActive ? '#EAB308' : 'var(--brand-accent)' }}
+            />
+          ) : chat.isPinned ? (
+            <Pin aria-hidden='true' className='size-[12px] text-[var(--text-icon)]' />
+          ) : undefined
+        }
+      >
         <button
           type='button'
           aria-label='Chat options'
@@ -89,14 +87,11 @@ function ChatRow({
             e.stopPropagation()
             onMoreClick(e, chat.id)
           }}
-          className={cn(
-            'absolute inset-0 flex items-center justify-center rounded-sm opacity-0 transition-opacity group-focus-within:opacity-100 group-hover:opacity-100',
-            isMenuOpen && 'opacity-100'
-          )}
+          className='flex size-[18px] items-center justify-center rounded-sm'
         >
           <MoreHorizontal className='size-[14px] text-[var(--text-icon)]' />
         </button>
-      </div>
+      </SidebarRowActions>
     </ChatNavigationLink>
   )
 }
diff --git a/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/workspaces-section/workspace-list.tsx b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/workspaces-section/workspace-list.tsx
index 8d1bfa0b942..faae4ebd437 100644
--- a/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/workspaces-section/workspace-list.tsx
+++ b/apps/sim/app/o/[organizationId]/components/organization-sidebar/components/workspaces-section/workspace-list.tsx
@@ -18,6 +18,7 @@ import { WorkspaceContextMenu } from '@/components/workspaces/workspace-context-
 import { getWorkspaceInitial } from '@/lib/workspaces/initials'
 import { useOrganizationWorkspaces } from '@/app/o/[organizationId]/components/organization-sidebar/hooks/use-organization-workspaces'
 import { SidebarRenameRow } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-rename-row'
+import { SidebarRowActions } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-row-actions'
 import { useFlyoutInlineRename } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-flyout-inline-rename'
 import type { useHoverMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-hover-menu'
 import { useToggleWorkspacePin, useUpdateWorkspace } from '@/hooks/queries/workspace'
@@ -139,6 +140,7 @@ export function WorkspaceList({ organizationId, pathname, flyout }: WorkspaceLis
               key={workspace.id}
               asChild
               active={isActive || isMenuOpen}
+              actionOpen={isMenuOpen}
               onPointerMove={(event) => {
                 if (menu.isOpen || rename.editingId) event.preventDefault()
               }}
@@ -176,34 +178,36 @@ export function WorkspaceList({ organizationId, pathname, flyout }: WorkspaceLis
           <SettingsGuardedLink
             key={workspace.id}
             href={href}
-            className={chipVariants({ active: isActive || isMenuOpen, fullWidth: true })}
+            className={cn(
+              chipVariants({ active: isActive || isMenuOpen, fullWidth: true }),
+              'group/sidebar-row'
+            )}
             onContextMenu={(event) => openMenu(event, workspace.id)}
           >
             {label}
-            <div className='relative flex size-[18px] shrink-0 items-center justify-center'>
-              {isPinned && (
-                <Pin
-                  role='img'
-                  aria-label='Pinned'
-                  className={cn(
-                    'absolute size-[12px] text-[var(--text-icon)] group-focus-within:opacity-0 group-hover:opacity-0',
-                    isMenuOpen && 'opacity-0'
-                  )}
-                />
-              )}
+            <SidebarRowActions
+              open={isMenuOpen}
+              indicator={
+                isPinned ? (
+                  <Pin
+                    role='img'
+                    aria-label='Pinned'
+                    aria-hidden={false}
+                    className='size-[12px] text-[var(--text-icon)]'
+                  />
+                ) : undefined
+              }
+            >
               <button
                 type='button'
                 aria-label={`Options for ${workspace.name}`}
                 onPointerDown={() => menu.preventDismiss()}
                 onClick={onMoreClick}
-                className={cn(
-                  'absolute inset-0 flex items-center justify-center rounded-sm opacity-0 group-focus-within:opacity-100 group-hover:opacity-100',
-                  isMenuOpen && 'opacity-100'
-                )}
+                className='flex size-[18px] items-center justify-center rounded-sm'
               >
                 <MoreHorizontal className='size-[14px] text-[var(--text-icon)]' />
               </button>
-            </div>
+            </SidebarRowActions>
           </SettingsGuardedLink>
         )
       })}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx
index f1790e469f5..726bfbb02a9 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx
@@ -10,17 +10,13 @@ import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
+  DropdownMenuItemAction,
+  DropdownMenuLabel,
   DropdownMenuSeparator,
   DropdownMenuTrigger,
   Duplicate,
   Layout,
   MoreHorizontal,
-  Popover,
-  PopoverContent,
-  PopoverItem,
-  PopoverScrollArea,
-  PopoverSection,
-  PopoverTrigger,
   Trash,
   toast,
 } from '@sim/emcn'
@@ -913,63 +909,55 @@ export const Panel = memo(function Panel() {
                     <Button variant='ghost' className='p-0' onClick={handleCopilotNewChat}>
                       <Plus className='size-[14px]' />
                     </Button>
-                    <Popover
+                    <DropdownMenu
                       open={isCopilotHistoryOpen}
                       onOpenChange={(open) => {
                         setIsCopilotHistoryOpen(open)
                         if (open) loadCopilotChats()
                       }}
                     >
-                      <PopoverTrigger asChild>
-                        <Button variant='ghost' className='p-0'>
+                      <DropdownMenuTrigger asChild>
+                        <Button variant='ghost' className='p-0' aria-label='Chat history'>
                           <BubbleChatDelay className='size-[14px]' />
                         </Button>
-                      </PopoverTrigger>
-                      <PopoverContent align='end' side='bottom' sideOffset={8} maxHeight={280}>
+                      </DropdownMenuTrigger>
+                      <DropdownMenuContent
+                        align='end'
+                        side='bottom'
+                        sideOffset={8}
+                        className='max-h-[280px] w-[220px]'
+                      >
                         {copilotChatList.length === 0 ? (
-                          <div className='px-1.5 py-4 text-center text-caption text-muted-foreground'>
-                            No chats yet
-                          </div>
+                          <DropdownMenuItem disabled>No chats yet</DropdownMenuItem>
                         ) : (
-                          <PopoverScrollArea>
-                            <PopoverSection className='pt-0'>Recent</PopoverSection>
-                            <div className='flex flex-col gap-0.5'>
-                              {copilotChatList.map((chat) => (
-                                <div key={chat.id} className='group'>
-                                  <PopoverItem
-                                    active={copilotChatId === chat.id}
-                                    onClick={() => handleCopilotSelectChat(chat)}
+                          <>
+                            <DropdownMenuLabel>Recent</DropdownMenuLabel>
+                            {copilotChatList.map((chat) => (
+                              <DropdownMenuItem
+                                key={chat.id}
+                                active={copilotChatId === chat.id}
+                                actionOpen={copilotChatId === chat.id}
+                                onSelect={() => handleCopilotSelectChat(chat)}
+                                action={
+                                  <DropdownMenuItemAction
+                                    aria-label='Delete chat'
+                                    onClick={() => handleCopilotDeleteChat(chat.id)}
                                   >
-                                    <ConversationListItem
-                                      title={chat.title || 'New Chat'}
-                                      isActive={Boolean(chat.activeStreamId)}
-                                      titleClassName='text-small'
-                                      actions={
-                                        <div
-                                          className={`flex shrink-0 items-center gap-1 ${copilotChatId !== chat.id ? 'opacity-0 transition-opacity group-hover:opacity-100' : ''}`}
-                                        >
-                                          <Button
-                                            variant='ghost'
-                                            className='size-[16px] p-0'
-                                            onClick={(e) => {
-                                              e.stopPropagation()
-                                              handleCopilotDeleteChat(chat.id)
-                                            }}
-                                            aria-label='Delete chat'
-                                          >
-                                            <Trash className='size-[10px]' />
-                                          </Button>
-                                        </div>
-                                      }
-                                    />
-                                  </PopoverItem>
-                                </div>
-                              ))}
-                            </div>
-                          </PopoverScrollArea>
+                                    <Trash />
+                                  </DropdownMenuItemAction>
+                                }
+                              >
+                                <ConversationListItem
+                                  title={chat.title || 'New Chat'}
+                                  isActive={Boolean(chat.activeStreamId)}
+                                  titleClassName='text-small'
+                                />
+                              </DropdownMenuItem>
+                            ))}
+                          </>
                         )}
-                      </PopoverContent>
-                    </Popover>
+                      </DropdownMenuContent>
+                    </DropdownMenu>
                   </div>
                 </div>
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/collapsed-sidebar-menu/collapsed-sidebar-menu.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/collapsed-sidebar-menu/collapsed-sidebar-menu.tsx
index 04c633b19fe..d3cbc7e1eb7 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/collapsed-sidebar-menu/collapsed-sidebar-menu.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/collapsed-sidebar-menu/collapsed-sidebar-menu.tsx
@@ -257,6 +257,7 @@ export function CollapsedSidebarMenu({
       <DropdownMenuContent
         side='right'
         align='start'
+        className='w-[220px]'
         sideOffset={8}
         {...hover.contentProps}
         onPointerMoveCapture={isEditing ? holdRowFocus : undefined}
@@ -327,13 +328,13 @@ export function CollapsedChatFlyoutItem({
     <DropdownMenuItem
       asChild
       active={isCurrentRoute || isMenuOpen}
+      actionOpen={isMenuOpen}
       action={
         showActions ? (
           <DropdownMenuItemAction
             aria-label='Chat options'
             onPointerDown={onMorePointerDown}
             onClick={(e) => onMoreClick?.(e, chat.id)}
-            className={cn(isMenuOpen && 'opacity-100')}
           >
             <MoreHorizontal />
           </DropdownMenuItemAction>
@@ -409,6 +410,7 @@ export function CollapsedWorkflowFlyoutItem({
     <DropdownMenuItem
       asChild
       active={isCurrentRoute || actionsOpen}
+      actionOpen={actionsOpen}
       onPointerMove={actionsOpen ? holdRowFocus : undefined}
       onPointerLeave={actionsOpen ? holdRowFocus : undefined}
       action={
@@ -423,7 +425,6 @@ export function CollapsedWorkflowFlyoutItem({
               <DropdownMenuItemAction
                 aria-label='Workflow options'
                 onClick={() => setActionsOpen((prev) => !prev)}
-                className={cn(actionsOpen && 'opacity-100')}
               >
                 <MoreHorizontal />
               </DropdownMenuItemAction>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/index.ts b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/index.ts
index e735e674e89..583f7b5aeca 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/index.ts
@@ -1,3 +1,4 @@
+export { SidebarRowActions } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-row-actions'
 export { ChatNavigationLink } from './chat-navigation-link/chat-navigation-link'
 export {
   CollapsedChatFlyoutItem,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-row-actions.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-row-actions.tsx
new file mode 100644
index 00000000000..1d966c4102a
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-row-actions.tsx
@@ -0,0 +1,51 @@
+import type { ReactNode } from 'react'
+import { cn } from '@sim/emcn'
+
+interface SidebarRowActionsProps {
+  children: ReactNode
+  indicator?: ReactNode
+  open?: boolean
+  revealOnHover?: boolean
+}
+
+/** Reclaims idle action space while retaining indicators and touch/keyboard access. */
+export function SidebarRowActions({
+  children,
+  indicator,
+  open = false,
+  revealOnHover = true,
+}: SidebarRowActionsProps) {
+  return (
+    <div
+      className={cn(
+        'relative size-[18px] shrink-0 items-center justify-center gap-1.5 [@media(hover:none)]:w-auto',
+        indicator || open ? 'flex' : 'hidden',
+        revealOnHover &&
+          'group-focus-within/sidebar-row:flex group-hover/sidebar-row:flex [@media(hover:none)]:flex'
+      )}
+    >
+      {indicator && (
+        <span
+          className={cn(
+            'pointer-events-none flex size-[18px] shrink-0 items-center justify-center transition-opacity',
+            open && '[@media(hover:hover)]:opacity-0',
+            revealOnHover &&
+              '[@media(hover:hover)]:group-focus-within/sidebar-row:opacity-0 [@media(hover:hover)]:group-hover/sidebar-row:opacity-0'
+          )}
+        >
+          {indicator}
+        </span>
+      )}
+      <div
+        className={cn(
+          'pointer-events-none absolute inset-0 flex items-center justify-center opacity-0 transition-opacity [@media(hover:none)]:static',
+          open && 'pointer-events-auto opacity-100',
+          revealOnHover &&
+            'group-focus-within/sidebar-row:pointer-events-auto group-focus-within/sidebar-row:opacity-100 group-hover/sidebar-row:pointer-events-auto group-hover/sidebar-row:opacity-100 [@media(hover:none)]:pointer-events-auto [@media(hover:none)]:opacity-100'
+        )}
+      >
+        {children}
+      </div>
+    </div>
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/folder-item/folder-item.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/folder-item/folder-item.tsx
index 914643aeba4..67a8bba50fe 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/folder-item/folder-item.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/folder-item/folder-item.tsx
@@ -17,6 +17,7 @@ import { useRouter } from 'next/navigation'
 import { SIM_RESOURCES_DRAG_TYPE } from '@/lib/copilot/resource-types'
 import { generateSubfolderName } from '@/lib/workspaces/naming'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
+import { SidebarRowActions } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-row-actions'
 import { ContextMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/context-menu/context-menu'
 import { DeleteModal } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/delete-modal/delete-modal'
 import {
@@ -385,16 +386,13 @@ export const FolderItem = memo(function FolderItem({ workspaceId, folder }: Fold
     [handleToggleExpanded, shouldPreventClickRef, isEditing, onFolderClick, folder.id]
   )
 
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent<HTMLDivElement>) => {
-      if (isEditing) {
-        handleRenameKeyDown(e)
-      } else {
-        handleExpandKeyDown(e)
-      }
-    },
-    [isEditing, handleRenameKeyDown, handleExpandKeyDown]
-  )
+  const handleKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => {
+    if (isEditing) {
+      handleRenameKeyDown(e)
+    } else if (e.target === e.currentTarget) {
+      handleExpandKeyDown(e)
+    }
+  }
 
   const handleMorePointerDown = useCallback(() => {
     if (isContextMenuOpen) {
@@ -503,6 +501,7 @@ export const FolderItem = memo(function FolderItem({ workspaceId, folder }: Fold
         aria-label={`${folder.name} folder, ${isExpanded ? 'expanded' : 'collapsed'}`}
         className={cn(
           chipVariants({ active: isSelected || isContextMenuOpen, fullWidth: true }),
+          'group/sidebar-row',
           (isDragging || (isAnyDragActive && isSelected)) && 'opacity-50'
         )}
         onClick={handleFolderSelect}
@@ -548,34 +547,30 @@ export const FolderItem = memo(function FolderItem({ workspaceId, folder }: Fold
             >
               <OverflowText label={folder.name} className='flex-1 text-[var(--text-body)]' />
             </div>
-            <div className='relative size-[18px] shrink-0'>
-              {folder.locked && (
-                <span
-                  role='img'
-                  aria-label='Folder is locked'
-                  className={cn(
-                    'pointer-events-none absolute inset-0 flex items-center justify-center transition-opacity',
-                    !isAnyDragActive && 'group-hover:opacity-0',
-                    isContextMenuOpen && 'opacity-0'
-                  )}
-                >
-                  <Lock className='size-[14px] text-[var(--text-icon)]' aria-hidden='true' />
-                </span>
-              )}
+            <SidebarRowActions
+              open={isContextMenuOpen}
+              revealOnHover={!isAnyDragActive}
+              indicator={
+                folder.locked ? (
+                  <Lock
+                    className='size-[14px] text-[var(--text-icon)]'
+                    role='img'
+                    aria-label='Folder is locked'
+                    aria-hidden={false}
+                  />
+                ) : undefined
+              }
+            >
               <button
                 type='button'
                 aria-label='Folder options'
                 onPointerDown={handleMorePointerDown}
                 onClick={handleMoreClick}
-                className={cn(
-                  'pointer-events-none absolute inset-0 flex items-center justify-center rounded-sm opacity-0 transition-opacity',
-                  !isAnyDragActive && 'group-hover:pointer-events-auto group-hover:opacity-100',
-                  isContextMenuOpen && 'pointer-events-auto opacity-100'
-                )}
+                className='flex size-[18px] items-center justify-center rounded-sm'
               >
                 <MoreHorizontal className='size-[16px] text-[var(--text-icon)]' />
               </button>
-            </div>
+            </SidebarRowActions>
           </div>
         )}
       </div>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/workflow-item/workflow-item.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/workflow-item/workflow-item.tsx
index 734aefef876..08c60fd1a81 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/workflow-item/workflow-item.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/workflow-item/workflow-item.tsx
@@ -6,6 +6,7 @@ import { Lock, MoreHorizontal } from '@sim/emcn/icons'
 import Link from 'next/link'
 import { SIM_RESOURCES_DRAG_TYPE } from '@/lib/copilot/resource-types'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
+import { SidebarRowActions } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/sidebar-row-actions'
 import { ContextMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/context-menu/context-menu'
 import { DeleteModal } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/delete-modal/delete-modal'
 import { Avatars } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/workflow-item/avatars/avatars'
@@ -410,6 +411,7 @@ export const WorkflowItem = memo(function WorkflowItem({
             active: active || isContextMenuOpen || (isSelected && selectedWorkflows.size > 1),
             fullWidth: true,
           }),
+          'group/sidebar-row',
           (isDragging || (isAnyDragActive && isSelected)) && 'opacity-50'
         )}
         draggable={!isEditing && !dragDisabled && !effectiveLocked}
@@ -448,43 +450,30 @@ export const WorkflowItem = memo(function WorkflowItem({
           </div>
         </div>
         {!isEditing && (
-          <div className='relative size-[18px] shrink-0'>
-            {workflow.locked && (
-              <span
-                role='img'
-                aria-label='Workflow is locked'
-                className={cn(
-                  'pointer-events-none absolute inset-0 flex items-center justify-center transition-opacity',
-                  !isAnyDragActive && 'group-hover:opacity-0',
-                  isContextMenuOpen && 'opacity-0'
-                )}
-              >
-                <Lock className='size-[14px] text-[var(--text-icon)]' aria-hidden='true' />
-              </span>
-            )}
+          <SidebarRowActions
+            open={isContextMenuOpen}
+            revealOnHover={!isAnyDragActive}
+            indicator={
+              workflow.locked ? (
+                <Lock
+                  className='size-[14px] text-[var(--text-icon)]'
+                  role='img'
+                  aria-label='Workflow is locked'
+                  aria-hidden={false}
+                />
+              ) : undefined
+            }
+          >
             <button
               type='button'
               aria-label='Workflow options'
               onPointerDown={handleMorePointerDown}
               onClick={handleMoreClick}
-              className={cn(
-                'pointer-events-none absolute inset-0 flex items-center justify-center rounded-sm opacity-0 transition-opacity',
-                !isAnyDragActive && 'group-hover:pointer-events-auto group-hover:opacity-100',
-                /**
-                 * `opacity-100` only. `pointer-events-auto` belongs here too,
-                 * but it has never applied: under `clsx` both it and the base
-                 * `pointer-events-none` shipped, and Tailwind emits
-                 * `pointer-events-none` last, so it won. Adding it back under
-                 * `cn` (where the last argument wins) would make the button
-                 * clickable for the first time — a real fix, but a behaviour
-                 * change that does not belong in a rendering-neutral upgrade.
-                 */
-                isContextMenuOpen && 'opacity-100'
-              )}
+              className='flex size-[18px] items-center justify-center rounded-sm'
             >
               <MoreHorizontal className='size-[16px] text-[var(--text-icon)]' />
             </button>
-          </div>
+          </SidebarRowActions>
         )}
       </Link>
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.tsx
index 6d083c20c63..5053a95637e 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.tsx
@@ -694,6 +694,7 @@ function WorkspaceHeaderImpl({
                         ) : (
                           <DropdownMenuItem
                             size='lg'
+                            actionOpen={isMenuOpen}
                             active={isActive || isMenuOpen || isKeyboardHighlighted}
                             onSelect={(event) => event.preventDefault()}
                             onPointerMove={preserveSearchFocus}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx
index 44f0619a5c6..98b1c4a670c 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx
@@ -77,6 +77,7 @@ import {
   SidebarFooter,
   SidebarNavChip,
   type SidebarNavItemData,
+  SidebarRowActions,
   SidebarSection,
   SidebarTooltip,
   StatusNotice,
@@ -249,10 +250,13 @@ const SidebarChatItem = memo(function SidebarChatItem({
         chatId={chat.id}
         href={chat.href}
         isCurrentRoute={isCurrentRoute}
-        className={chipVariants({
-          active: isCurrentRoute || isSelected || isMenuOpen,
-          fullWidth: true,
-        })}
+        className={cn(
+          chipVariants({
+            active: isCurrentRoute || isSelected || isMenuOpen,
+            fullWidth: true,
+          }),
+          'group/sidebar-row'
+        )}
         onClick={(e) => {
           if (e.metaKey || e.ctrlKey) return
           if (e.shiftKey) {
@@ -269,28 +273,20 @@ const SidebarChatItem = memo(function SidebarChatItem({
       >
         <OverflowText label={chat.name} className='flex-1 text-[var(--text-body)]' />
         {chat.id !== 'new' && (
-          <div className='relative flex size-[18px] shrink-0 items-center justify-center'>
-            {showStatusDot && (
-              <span
-                aria-hidden='true'
-                className={cn(
-                  'size-[6px] rounded-full transition-opacity',
-                  isMenuOpen ? 'opacity-0' : 'group-hover:opacity-0'
-                )}
-                style={{
-                  backgroundColor: isActive ? '#EAB308' : 'var(--brand-accent)',
-                }}
-              />
-            )}
-            {!showStatusDot && isPinned && (
-              <Pin
-                aria-hidden='true'
-                className={cn(
-                  'absolute size-[12px] text-[var(--text-icon)] transition-opacity',
-                  isMenuOpen ? 'opacity-0' : 'group-hover:opacity-0'
-                )}
-              />
-            )}
+          <SidebarRowActions
+            open={isMenuOpen}
+            indicator={
+              showStatusDot ? (
+                <span
+                  aria-hidden='true'
+                  className='size-[6px] rounded-full'
+                  style={{ backgroundColor: isActive ? '#EAB308' : 'var(--brand-accent)' }}
+                />
+              ) : isPinned ? (
+                <Pin aria-hidden='true' className='size-[12px] text-[var(--text-icon)]' />
+              ) : undefined
+            }
+          >
             <button
               type='button'
               aria-label='Chat options'
@@ -300,14 +296,11 @@ const SidebarChatItem = memo(function SidebarChatItem({
                 e.stopPropagation()
                 onMoreClick(e, chat.id)
               }}
-              className={cn(
-                'absolute inset-0 flex items-center justify-center rounded-sm opacity-0 transition-opacity group-hover:opacity-100',
-                isMenuOpen && 'opacity-100'
-              )}
+              className='flex size-[18px] items-center justify-center rounded-sm'
             >
               <MoreHorizontal className='size-[14px] text-[var(--text-icon)]' />
             </button>
-          </div>
+          </SidebarRowActions>
         )}
       </ChatNavigationLink>
     </SidebarTooltip>
diff --git a/packages/emcn/src/components/dropdown-menu/dropdown-menu.test.tsx b/packages/emcn/src/components/dropdown-menu/dropdown-menu.test.tsx
index 94145633802..d810dfb4472 100644
--- a/packages/emcn/src/components/dropdown-menu/dropdown-menu.test.tsx
+++ b/packages/emcn/src/components/dropdown-menu/dropdown-menu.test.tsx
@@ -10,12 +10,13 @@
  */
 import { act, type ReactNode } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, describe, expect, it } from 'vitest'
+import { afterEach, describe, expect, it, vi } from 'vitest'
 import {
   DropdownMenu,
   DropdownMenuCheckboxItem,
   DropdownMenuContent,
   DropdownMenuItem,
+  DropdownMenuItemAction,
   DropdownMenuItemLabel,
   DropdownMenuTrigger,
 } from './dropdown-menu'
@@ -129,3 +130,73 @@ describe('menu row labels', () => {
     expect(label?.className).not.toContain('truncate')
   })
 })
+
+describe('menu row actions', () => {
+  it('moves focus to an action and back without selecting the row', () => {
+    const onSelect = vi.fn()
+    openMenu(
+      <DropdownMenuItem
+        onSelect={onSelect}
+        action={<DropdownMenuItemAction aria-label='Options'>More</DropdownMenuItemAction>}
+      >
+        A workflow
+      </DropdownMenuItem>
+    )
+    const item = row()
+    const action = row('button[aria-label="Options"]')
+    act(() => {
+      item.focus()
+      item.dispatchEvent(new KeyboardEvent('keydown', { key: 'ArrowRight', bubbles: true }))
+    })
+    expect(document.activeElement).toBe(action)
+    act(() => {
+      action.dispatchEvent(new KeyboardEvent('keydown', { key: 'ArrowLeft', bubbles: true }))
+    })
+    expect(document.activeElement).toBe(item)
+    expect(onSelect).not.toHaveBeenCalled()
+  })
+
+  it('invokes an action without navigating its asChild row or closing the menu', () => {
+    const onSelect = vi.fn()
+    const onAction = vi.fn()
+    openMenu(
+      <DropdownMenuItem
+        asChild
+        onSelect={onSelect}
+        actionOpen
+        action={
+          <DropdownMenuItemAction aria-label='Options' onClick={onAction}>
+            More
+          </DropdownMenuItemAction>
+        }
+      >
+        <a href='#workflow'>A workflow</a>
+      </DropdownMenuItem>
+    )
+    act(() => row('button[aria-label="Options"]').click())
+    expect(onAction).toHaveBeenCalledOnce()
+    expect(onSelect).not.toHaveBeenCalled()
+    expect(row('a').getAttribute('href')).toBe('#workflow')
+    expect(document.querySelector('[role="menu"]')).not.toBeNull()
+  })
+
+  it('keeps focus on the row when its action is disabled', () => {
+    openMenu(
+      <DropdownMenuItem
+        action={
+          <DropdownMenuItemAction disabled aria-label='Options'>
+            More
+          </DropdownMenuItemAction>
+        }
+      >
+        A workflow
+      </DropdownMenuItem>
+    )
+    const item = row()
+    act(() => {
+      item.focus()
+      item.dispatchEvent(new KeyboardEvent('keydown', { key: 'ArrowRight', bubbles: true }))
+    })
+    expect(document.activeElement).toBe(item)
+  })
+})
diff --git a/packages/emcn/src/components/dropdown-menu/dropdown-menu.tsx b/packages/emcn/src/components/dropdown-menu/dropdown-menu.tsx
index 8417f9e6208..6fea1973ce2 100644
--- a/packages/emcn/src/components/dropdown-menu/dropdown-menu.tsx
+++ b/packages/emcn/src/components/dropdown-menu/dropdown-menu.tsx
@@ -327,28 +327,75 @@ const DropdownMenuItem = React.forwardRef<
       /**
        * Optional inline action rendered on the right edge of the item — e.g. a
        * "more" icon button. Reveals on hover/focus of the row, and the row stays
-       * highlighted while the cursor is over the action.
+       * highlighted while the cursor is over the action. ArrowRight moves from
+       * the row to its action; ArrowLeft returns to the row.
        */
       action?: React.ReactNode
-      /** Idle indicator sharing the action slot so the label never shifts. */
+      /** Keeps the action visible while its portaled menu is open. */
+      actionOpen?: boolean
+      /** Idle indicator sharing the action slot on hover-capable devices. */
       actionIndicator?: React.ReactNode
     }
 >(
   (
-    { className, size, inset, active, action, actionIndicator, asChild, children, ...props },
+    {
+      className,
+      size,
+      inset,
+      active,
+      action,
+      actionOpen,
+      actionIndicator,
+      asChild,
+      children,
+      ...props
+    },
     ref
   ) => {
+    const actionRef = React.useRef<HTMLDivElement>(null)
     const content = asChild ? children : withOverflowLabel(children)
     const stateClasses = active ? MENU_ROW_SELECTED_CLASS : MENU_ROW_HIGHLIGHT_CLASS
     if (action) {
       return (
-        <div className='group/dropdownitem relative'>
+        <div
+          className='group/dropdownitem relative'
+          onKeyDown={(event) => {
+            if (
+              event.defaultPrevented ||
+              event.altKey ||
+              event.ctrlKey ||
+              event.metaKey ||
+              event.shiftKey
+            )
+              return
+            const row = event.currentTarget.firstElementChild
+            const actionButton =
+              actionRef.current?.querySelector<HTMLButtonElement>('button:not(:disabled)')
+            if (event.key === 'ArrowRight' && event.target === row && actionButton) {
+              event.preventDefault()
+              event.stopPropagation()
+              actionButton.focus()
+            } else if (
+              event.key === 'ArrowLeft' &&
+              row instanceof HTMLElement &&
+              event.target instanceof Node &&
+              actionRef.current?.contains(event.target)
+            ) {
+              event.preventDefault()
+              event.stopPropagation()
+              row.focus()
+            }
+          }}
+        >
           <DropdownMenuPrimitive.Item
             ref={ref}
             className={cn(
               dropdownMenuItemVariants({ size }),
               stateClasses,
-              'pr-[28px]',
+              actionIndicator || actionOpen
+                ? 'pr-[28px]'
+                : '[@media(hover:hover)]:group-focus-within/dropdownitem:pr-[28px] [@media(hover:hover)]:group-hover/dropdownitem:pr-[28px]',
+              actionIndicator ? '[@media(hover:none)]:pr-[52px]' : '[@media(hover:none)]:pr-[28px]',
               inset && 'pl-7',
               className
             )}
@@ -357,13 +404,24 @@ const DropdownMenuItem = React.forwardRef<
           >
             {content}
           </DropdownMenuPrimitive.Item>
-          <div className='-translate-y-1/2 absolute top-1/2 right-1 flex items-center'>
+          <div className='-translate-y-1/2 pointer-events-none absolute top-1/2 right-1 flex size-[18px] items-center gap-1.5 [@media(hover:none)]:w-auto'>
             {actionIndicator && (
-              <div className='pointer-events-none absolute inset-0 flex items-center justify-center group-focus-within/dropdownitem:opacity-0 group-hover/dropdownitem:opacity-0'>
+              <div
+                className={cn(
+                  'pointer-events-none flex size-[18px] shrink-0 items-center justify-center [@media(hover:hover)]:group-focus-within/dropdownitem:opacity-0 [@media(hover:hover)]:group-hover/dropdownitem:opacity-0',
+                  actionOpen && '[@media(hover:hover)]:opacity-0'
+                )}
+              >
                 {actionIndicator}
               </div>
             )}
-            <div className='flex items-center opacity-0 transition-opacity group-focus-within/dropdownitem:opacity-100 group-hover/dropdownitem:opacity-100'>
+            <div
+              ref={actionRef}
+              className={cn(
+                'pointer-events-none absolute inset-0 flex items-center opacity-0 transition-opacity group-focus-within/dropdownitem:pointer-events-auto group-focus-within/dropdownitem:opacity-100 group-hover/dropdownitem:pointer-events-auto group-hover/dropdownitem:opacity-100 [@media(hover:none)]:pointer-events-auto [@media(hover:none)]:static [@media(hover:none)]:opacity-100',
+                actionOpen && 'pointer-events-auto opacity-100'
+              )}
+            >
               {action}
             </div>
           </div>