diff --git a/ILSpy/DebugSteps.xaml b/ILSpy/DebugSteps.xaml
index 6f0d09dfc..a96d1463e 100644
--- a/ILSpy/DebugSteps.xaml
+++ b/ILSpy/DebugSteps.xaml
@@ -15,8 +15,8 @@
 			</TreeView.ItemTemplate>
 			<TreeView.ContextMenu>
 				<ContextMenu>
-					<MenuItem Header="Show state before this step" Click="ShowStateBefore_Click" />
-					<MenuItem Header="Show state after this step" Click="ShowStateAfter_Click" />
+					<MenuItem Header="Show state before this step" Click="ShowStateBefore_Click" InputGestureText="Shift+Enter" />
+					<MenuItem Header="Show state after this step" Click="ShowStateAfter_Click" InputGestureText="Enter" />
 					<MenuItem Header="Debug this step" Click="DebugStep_Click" />
 				</ContextMenu>
 			</TreeView.ContextMenu>
diff --git a/ILSpy/DebugSteps.xaml.cs b/ILSpy/DebugSteps.xaml.cs
index 787cb3692..f5853447c 100644
--- a/ILSpy/DebugSteps.xaml.cs
+++ b/ILSpy/DebugSteps.xaml.cs
@@ -112,7 +112,10 @@ namespace ICSharpCode.ILSpy
 		private void tree_KeyDown(object sender, KeyEventArgs e)
 		{
 			if (e.Key == Key.Enter || e.Key == Key.Return) {
-				ShowStateAfter_Click(sender, e);
+				if (e.KeyboardDevice.Modifiers == ModifierKeys.Shift)
+					ShowStateBefore_Click(sender, e);
+				else
+					ShowStateAfter_Click(sender, e);
 				e.Handled = true;
 			}
 		}