diff --git a/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceMenuItem.tsx b/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceMenuItem.tsx
index 2ad764823..684450d03 100644
--- a/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceMenuItem.tsx
+++ b/packages/web/src/javascripts/Components/AccountMenu/WorkspaceSwitcher/WorkspaceMenuItem.tsx
@@ -44,8 +44,9 @@ const WorkspaceMenuItem: FunctionComponent<Props> = ({
   }, [])
 
   const handleInputKeyDown: KeyboardEventHandler = useCallback((event) => {
-    if (event.key === KeyboardKey.Enter) {
+    if (event.key === KeyboardKey.Enter || event.key === KeyboardKey.Escape) {
       event.preventDefault()
+      event.stopPropagation()
       itemRef.current?.focus()
     }
   }, [])