diff --git a/src/App.svelte b/src/App.svelte
index ec2ff12..9735a72 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -2801,6 +2801,7 @@
 
   function handleWindowContextMenu(event: MouseEvent) {
     event.preventDefault();
+    if (repoTabContextMenu) closeRepoTabContextMenu();
   }
 
   function handleWindowClick() {
@@ -2812,7 +2813,7 @@
   <title>GitLite</title>
 </svelte:head>
 
-<svelte:window on:click={handleWindowClick} on:keydown={handleWindowKeydown} on:contextmenu={handleWindowContextMenu} />
+<svelte:window on:click={handleWindowClick} on:keydown={handleWindowKeydown} on:contextmenu|capture={handleWindowContextMenu} />
 
 <main class="shell">
   <TitleBar