From 4956baf7cece3a2c71109e4bc216ff946f51b85b Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Thu, 8 Jan 2026 12:42:08 -0800
Subject: [PATCH 1/2] descendant button

---
 .../WorkspaceListItem/WorkspaceListItem.tsx         | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx
index f7a3d84426b..ea6164361b0 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx
@@ -291,12 +291,19 @@ export function WorkspaceListItem({
 	}
 
 	const content = (
-		<button
-			type="button"
+		<div
+			role="button"
+			tabIndex={0}
 			ref={(node) => {
 				drag(drop(node));
 			}}
 			onClick={handleClick}
+			onKeyDown={(e) => {
+				if (e.key === "Enter" || e.key === " ") {
+					e.preventDefault();
+					handleClick();
+				}
+			}}
 			onMouseEnter={handleMouseEnter}
 			onDoubleClick={isBranchWorkspace ? undefined : rename.startRename}
 			className={cn(
@@ -443,7 +450,7 @@ export function WorkspaceListItem({
 					</Button>
 				)}
 			</div>
-		</button>
+		</div>
 	);
 
 	const unreadMenuItem = (

From a62a69035c3d7d04a704b4b9d02981403ba40f0c Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Thu, 8 Jan 2026 13:05:07 -0800
Subject: [PATCH 2/2] ignore lint

---
 .../WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx
index ea6164361b0..14d10363964 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/WorkspaceListItem.tsx
@@ -291,6 +291,7 @@ export function WorkspaceListItem({
 	}
 
 	const content = (
+		// biome-ignore lint/a11y/useSemanticElements: Can't use <button> because this contains nested buttons (BranchSwitcher, close button)
 		<div
 			role="button"
 			tabIndex={0}