diff --git a/ILSpy/Views/MainWindow.axaml b/ILSpy/Views/MainWindow.axaml
index 1e51d02504..2fa6a67d67 100644
--- a/ILSpy/Views/MainWindow.axaml
+++ b/ILSpy/Views/MainWindow.axaml
@@ -20,8 +20,7 @@
 	</Design.DataContext>
 
 	<Window.KeyBindings>
-		<!-- Browser-style navigation. XButton1/2 (mouse Back/Forward) aren't first-class in
-		     Avalonia 12 yet, so we wire keyboard only for now. -->
+		<!-- Browser-style keyboard navigation. -->
 		<KeyBinding Gesture="Alt+Left" Command="{Binding DockWorkspace.NavigateBackCommand}" />
 		<KeyBinding Gesture="Alt+Right" Command="{Binding DockWorkspace.NavigateForwardCommand}" />
 		<!-- Search pane shortcuts. Ctrl+Shift+F is the WPF default; Ctrl+E mirrors the
diff --git a/ILSpy/Views/MainWindow.axaml.cs b/ILSpy/Views/MainWindow.axaml.cs
index 81988fa547..2d3d9d637f 100644
--- a/ILSpy/Views/MainWindow.axaml.cs
+++ b/ILSpy/Views/MainWindow.axaml.cs
@@ -21,6 +21,8 @@
 
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
 
 using ICSharpCode.ILSpy.AppEnv;
 using ICSharpCode.ILSpy.ViewModels;
@@ -33,6 +35,14 @@ public partial class MainWindow : Window
 	{
 		readonly SettingsService? settingsService;
 
+		static MainWindow()
+		{
+			PointerReleasedEvent.AddClassHandler<MainWindow>(
+				OnBrowserNavigationPointerReleased,
+				RoutingStrategies.Bubble,
+				handledEventsToo: true);
+		}
+
 		public MainWindow()
 		{
 			// Parameterless ctor — design-time / preview only. The runtime path uses the
@@ -77,6 +87,24 @@ public MainWindow(MainWindowViewModel viewModel, SettingsService settingsService
 			AppLog.Mark("MainWindow ctor exited");
 		}
 
+		static void OnBrowserNavigationPointerReleased(MainWindow window, PointerReleasedEventArgs e)
+		{
+			if (window.DataContext is not MainWindowViewModel viewModel)
+				return;
+
+			var command = e.InitialPressMouseButton switch {
+				MouseButton.XButton1 => viewModel.DockWorkspace.NavigateBackCommand,
+				MouseButton.XButton2 => viewModel.DockWorkspace.NavigateForwardCommand,
+				_ => null
+			};
+
+			if (command?.CanExecute(null) == true)
+			{
+				command.Execute(null);
+				e.Handled = true;
+			}
+		}
+
 		static void SurfaceCompositionErrors()
 		{
 			if (!AppEnv.CompositionErrors.Any)