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