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..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,12 +291,20 @@ export function WorkspaceListItem({
 	}
 
 	const content = (
-		<button
-			type="button"
+		// biome-ignore lint/a11y/useSemanticElements: Can't use <button> because this contains nested buttons (BranchSwitcher, close 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 +451,7 @@ export function WorkspaceListItem({
 					</Button>
 				)}
 			</div>
-		</button>
+		</div>
 	);
 
 	const unreadMenuItem = (