diff --git a/packages/kilo-vscode/webview-ui/src/components/history/SessionList.tsx b/packages/kilo-vscode/webview-ui/src/components/history/SessionList.tsx
index db81a08e071..2c5807ff483 100644
--- a/packages/kilo-vscode/webview-ui/src/components/history/SessionList.tsx
+++ b/packages/kilo-vscode/webview-ui/src/components/history/SessionList.tsx
@@ -105,7 +105,11 @@ const SessionList: Component<SessionListProps> = (props) => {
           {node}
         </ContextMenu.Trigger>
         <ContextMenu.Portal>
-          <ContextMenu.Content class="session-list-menu">
+          <ContextMenu.Content
+            onCloseAutoFocus={(event) => {
+              if (renamingId() === item.id) event.preventDefault()
+            }}
+          >
             <ContextMenu.Item onSelect={() => startRename(item)}>
               <ContextMenu.ItemLabel>{language.t("common.rename")}</ContextMenu.ItemLabel>
             </ContextMenu.Item>
diff --git a/packages/kilo-vscode/webview-ui/src/styles/history.css b/packages/kilo-vscode/webview-ui/src/styles/history.css
index 5c665971384..b41b8b9473f 100644
--- a/packages/kilo-vscode/webview-ui/src/styles/history.css
+++ b/packages/kilo-vscode/webview-ui/src/styles/history.css
@@ -61,28 +61,6 @@ body.vscode-light
   opacity: 1;
 }
 
-.session-list-menu {
-  min-width: 180px;
-  border: 1px solid color-mix(in oklch, var(--border-base) 50%, transparent) !important;
-  box-shadow: var(--shadow-md) !important;
-
-  [data-slot="context-menu-item"] {
-    padding: 6px 10px;
-    font-size: var(--font-size-small);
-    line-height: var(--line-height-large);
-    transition: none;
-
-    &:hover,
-    &[data-highlighted] {
-      background: var(--surface-raised-base-hover);
-    }
-  }
-
-  [data-slot="context-menu-separator"] {
-    margin: 4px 0;
-  }
-}
-
 /* History View (unified Local + Cloud tabs) */
 .history-view {
   display: flex;