diff --git a/gitbutler-ui/src/lib/components/FileContextMenu.svelte b/gitbutler-ui/src/lib/components/FileContextMenu.svelte
index 3ebd6d962..6b94697e9 100644
--- a/gitbutler-ui/src/lib/components/FileContextMenu.svelte
+++ b/gitbutler-ui/src/lib/components/FileContextMenu.svelte
@@ -21,14 +21,20 @@
 	}
 </script>
 
-<PopupMenu bind:this={popupMenu} let:item>
+<PopupMenu bind:this={popupMenu} let:item let:dismiss>
 	<ContextMenu>
 		<ContextMenuSection>
 			{#if item.files !== undefined}
 				{#if containsBinaryFiles(item)}
 					<ContextMenuItem label="Discard file (Binary files not yet supported)" disabled />
 				{:else}
-					<ContextMenuItem label="Discard file" on:click={() => confirmationModal.show(item)} />
+					<ContextMenuItem
+						label="Discard file"
+						on:click={() => {
+							confirmationModal.show(item);
+							dismiss();
+						}}
+					/>
 				{/if}
 			{/if}
 		</ContextMenuSection>
diff --git a/gitbutler-ui/src/lib/components/HunkContextMenu.svelte b/gitbutler-ui/src/lib/components/HunkContextMenu.svelte
index d18ff123b..d854ebef9 100644
--- a/gitbutler-ui/src/lib/components/HunkContextMenu.svelte
+++ b/gitbutler-ui/src/lib/components/HunkContextMenu.svelte
@@ -16,17 +16,25 @@
 	}
 </script>
 
-<PopupMenu bind:this={popupMenu} let:item>
+<PopupMenu bind:this={popupMenu} let:item let:dismiss>
 	<ContextMenu>
 		<ContextMenuSection>
 			{#if item.hunk !== undefined}
-				<ContextMenuItem label="Discard" on:click={() => branchController.unapplyHunk(item.hunk)} />
+				<ContextMenuItem
+					label="Discard"
+					on:click={() => {
+						branchController.unapplyHunk(item.hunk);
+						dismiss();
+					}}
+				/>
 			{/if}
 			{#if item.lineNumber}
 				<ContextMenuItem
 					label="Open in VS Code"
-					on:click={() =>
-						projectPath && open(`vscode://file${projectPath}/${filePath}:${item.lineNumber}`)}
+					on:click={() => {
+						projectPath && open(`vscode://file${projectPath}/${filePath}:${item.lineNumber}`);
+						dismiss();
+					}}
 				/>
 			{/if}
 		</ContextMenuSection>
diff --git a/gitbutler-ui/src/lib/components/PopupMenu.svelte b/gitbutler-ui/src/lib/components/PopupMenu.svelte
index f1d772771..280c7b8f5 100644
--- a/gitbutler-ui/src/lib/components/PopupMenu.svelte
+++ b/gitbutler-ui/src/lib/components/PopupMenu.svelte
@@ -55,7 +55,7 @@
 		use:clickOutside={{ handler: () => onDismiss() }}
 		style="position: absolute; top:{pos.y}px; left:{pos.x}px"
 	>
-		<slot {item} />
+		<slot {item} dismiss={onDismiss} />
 	</div>
 {/if}