diff --git a/src/ViewModels/StashesPage.cs b/src/ViewModels/StashesPage.cs
index 7efcd1a4..a9952711 100644
--- a/src/ViewModels/StashesPage.cs
+++ b/src/ViewModels/StashesPage.cs
@@ -180,7 +180,7 @@ namespace SourceGit.ViewModels
                     var opts = new List<Models.DiffOption>();
                     foreach (var c in _changes)
                     {
-                        if (c.Index == Models.ChangeState.Added && _selectedStash.Parents.Count == 3)
+                        if (_untracked.Contains(c))
                             opts.Add(new Models.DiffOption(Models.Commit.EmptyTreeSHA1, _selectedStash.Parents[2], c));
                         else
                             opts.Add(new Models.DiffOption(_selectedStash.Parents[0], _selectedStash.SHA, c));