diff --git a/ILSpy/Views/DebugSteps.axaml b/ILSpy/Views/DebugSteps.axaml
index 594653033..591997054 100644
--- a/ILSpy/Views/DebugSteps.axaml
+++ b/ILSpy/Views/DebugSteps.axaml
@@ -45,7 +45,6 @@
 		          ItemsSource="{Binding Steps}"
 		          SelectedItem="{Binding SelectedStep, Mode=TwoWay}"
 		          DoubleTapped="OnTreeDoubleTapped"
-		          KeyDown="OnTreeKeyDown"
 		          x:CompileBindings="False">
 			<TreeView.Styles>
 				<!-- Hide rows that neither match the filter nor lead to a match, and expand the tree
diff --git a/ILSpy/Views/DebugSteps.axaml.cs b/ILSpy/Views/DebugSteps.axaml.cs
index 227b6a5b7..cf6de5de0 100644
--- a/ILSpy/Views/DebugSteps.axaml.cs
+++ b/ILSpy/Views/DebugSteps.axaml.cs
@@ -37,6 +37,11 @@ namespace ICSharpCode.ILSpy.Views
 		public DebugSteps()
 		{
 			InitializeComponent();
+			// TreeViewItem.OnKeyDown consumes Enter/Return to expand or collapse the focused row
+			// (marking the event handled) before it bubbles, so a bubble-phase handler never sees
+			// Enter on a group row. Intercept in the tunnel phase, ahead of the item, so Enter and
+			// Shift+Enter drive the show-state commands for both leaf and group steps.
+			StepsTree.AddHandler(InputElement.KeyDownEvent, OnTreeKeyDown, RoutingStrategies.Tunnel, handledEventsToo: true);
 		}
 
 		void OnTreeDoubleTapped(object? sender, TappedEventArgs e)