diff --git a/src/ViewModels/StashesPage.cs b/src/ViewModels/StashesPage.cs
index 57b30fd3..9e220234 100644
--- a/src/ViewModels/StashesPage.cs
+++ b/src/ViewModels/StashesPage.cs
@@ -89,7 +89,7 @@ namespace SourceGit.ViewModels
             private set
             {
                 if (SetProperty(ref _changes, value))
-                    SelectedChange = null;
+                    SelectedChange = value is { Count: >0 } ? value[0] : null;
             }
         }