From 9fa44bc13574817c0b0de56e1ee84e93745ac67c Mon Sep 17 00:00:00 2001
From: kongehund <63306696+kongehund@users.noreply.github.com>
Date: Wed, 11 Dec 2024 13:19:11 +0100
Subject: [PATCH] Close object context menu on tool change

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 4b64548f9c..57966c38bc 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -531,6 +531,9 @@ namespace osu.Game.Rulesets.Edit
 
             if (!(tool is SelectTool))
                 EditorBeatmap.SelectedHitObjects.Clear();
+
+            // Prevent object context menu from staying open.
+            GetContainingFocusManager()?.ChangeFocus(null);
         }
 
         #endregion