diff --git a/src/components/context-menu/ContextMenu.svelte b/src/components/context-menu/ContextMenu.svelte
index 6eccba8345..3a8b94592f 100644
--- a/src/components/context-menu/ContextMenu.svelte
+++ b/src/components/context-menu/ContextMenu.svelte
@@ -1,7 +1,18 @@
 <svelte:options accessors={true} immutable={true} />
 
+<script lang="ts" context="module">
+  type HideFns = Set<() => void>;
+  const hideFns: HideFns = new Set<() => void>();
+
+  export function hideAllMenus() {
+    hideFns.forEach(hideFn => {
+      hideFn();
+    });
+  }
+</script>
+
 <script lang="ts">
-  import { createEventDispatcher } from 'svelte';
+  import { createEventDispatcher, onDestroy, onMount } from 'svelte';
   import { fade } from 'svelte/transition';
 
   const dispatch = createEventDispatcher<{
@@ -33,6 +44,7 @@
   }
 
   export function show(e: MouseEvent): void {
+    hideAllMenus();
     e.preventDefault();
     shown = true;
     x = e.clientX;
@@ -44,6 +56,14 @@
   let x: number;
   let y: number;
 
+  onMount(() => {
+    hideFns.add(hide);
+  });
+
+  onDestroy(() => {
+    hideFns.delete(hide);
+  });
+
   $: if (div) {
     const rect = div.getBoundingClientRect();
     if (x + rect.width > window.innerWidth) {
diff --git a/src/components/menus/Menu.svelte b/src/components/menus/Menu.svelte
index 462e01ffa0..d9d2cb0481 100644
--- a/src/components/menus/Menu.svelte
+++ b/src/components/menus/Menu.svelte
@@ -12,7 +12,6 @@
   };
 
   export function hideAllMenus(type?: MenuType) {
-    // TODO: https://github.com/sveltejs/language-tools/issues/1229
     if (type) {
       hideFns[type].forEach(hide => {
         hide();