diff --git a/src/client/InputHandler.ts b/src/client/InputHandler.ts
index e97e1da86..1a2217b9b 100644
--- a/src/client/InputHandler.ts
+++ b/src/client/InputHandler.ts
@@ -140,6 +140,7 @@ export class InputHandler {
         if (dist < 10) {
             if (event.pointerType == "touch") {
                 event.preventDefault()
+                console.log('firing context menu event')
                 this.eventBus.emit(new ContextMenuEvent(event.clientX, event.clientY))
             } else {
                 this.eventBus.emit(new MouseUpEvent(event.x, event.y))
diff --git a/src/client/graphics/layers/radial/BuildMenu.ts b/src/client/graphics/layers/radial/BuildMenu.ts
index 33baa008e..304adaea1 100644
--- a/src/client/graphics/layers/radial/BuildMenu.ts
+++ b/src/client/graphics/layers/radial/BuildMenu.ts
@@ -40,10 +40,6 @@ export class BuildMenu extends LitElement {
     private myPlayer: Player;
     private clickedCell: Cell;
 
-    init() {
-        this.eventBus.on(ContextMenuEvent, (e) => { this.hideMenu() })
-    }
-
     static styles = css`
         :host {
             display: block;
diff --git a/src/client/graphics/layers/radial/RadialMenu.ts b/src/client/graphics/layers/radial/RadialMenu.ts
index d03892230..c4e19bc5b 100644
--- a/src/client/graphics/layers/radial/RadialMenu.ts
+++ b/src/client/graphics/layers/radial/RadialMenu.ts
@@ -201,6 +201,10 @@ export class RadialMenu implements Layer {
     }
 
     private onContextMenu(event: ContextMenuEvent) {
+        if (this.buildMenu.isVisible) {
+            this.buildMenu.hideMenu()
+            return
+        }
         if (this.isVisible) {
             this.hideRadialMenu()
             return