diff --git a/src/lib/components/controls/contextmenu/ContextMenuDropDownButton.svelte b/src/lib/components/controls/contextmenu/ContextMenuDropDownButton.svelte
index 64a0ed17..43aa658d 100644
--- a/src/lib/components/controls/contextmenu/ContextMenuDropDownButton.svelte
+++ b/src/lib/components/controls/contextmenu/ContextMenuDropDownButton.svelte
@@ -7,9 +7,17 @@
   export let item: MenuDropDownButton
   export let className: string | undefined = undefined
   export let onCloseContextMenu: () => void
+
+  $: items = item.items.map(item => ({
+    ...item,
+    onClick: (event: MouseEvent) => {
+      onCloseContextMenu()
+      item.onClick(event)
+    }
+  }))
 </script>
 
-<DropdownButton width={item.width} items={item.items}>
+<DropdownButton width={item.width} items={items}>
   <button
     class={classnames('jse-context-menu-button', className, item.main.className)}
     type="button"
diff --git a/src/routes/development/+page.svelte b/src/routes/development/+page.svelte
index 3d15a1ce..0473c134 100644
--- a/src/routes/development/+page.svelte
+++ b/src/routes/development/+page.svelte
@@ -381,7 +381,7 @@
 
   function onRenderContextMenu(items: ContextMenuItem[], context: RenderMenuContext) {
     console.log('onRenderContextMenu', items, context)
-    return items // This return is equivalent to onRenderContextMenu is undefined
+    return items
   }
 
   function openInWindow() {