diff --git a/src/ViewModels/Checkout.cs b/src/ViewModels/Checkout.cs
index 87f5a51c..68311b15 100644
--- a/src/ViewModels/Checkout.cs
+++ b/src/ViewModels/Checkout.cs
@@ -59,11 +59,7 @@ namespace SourceGit.ViewModels
                 if (needPopStash)
                 {
                     SetProgressDescription("Re-apply local changes...");
-                    rs = new Commands.Stash(_repo.FullPath).Apply("stash@{0}");
-                    if (rs)
-                    {
-                        rs = new Commands.Stash(_repo.FullPath).Drop("stash@{0}");
-                    }
+                    rs = new Commands.Stash(_repo.FullPath).Pop("stash@{0}");
                 }
 
                 CallUIThread(() => _repo.SetWatcherEnabled(true));
diff --git a/src/ViewModels/CheckoutCommit.cs b/src/ViewModels/CheckoutCommit.cs
index 25f809ef..54cdbccd 100644
--- a/src/ViewModels/CheckoutCommit.cs
+++ b/src/ViewModels/CheckoutCommit.cs
@@ -59,11 +59,7 @@ namespace SourceGit.ViewModels
                 if (needPopStash)
                 {
                     SetProgressDescription("Re-apply local changes...");
-                    rs = new Commands.Stash(_repo.FullPath).Apply("stash@{0}");
-                    if (rs)
-                    {
-                        rs = new Commands.Stash(_repo.FullPath).Drop("stash@{0}");
-                    }
+                    rs = new Commands.Stash(_repo.FullPath).Pop("stash@{0}");
                 }
 
                 CallUIThread(() => _repo.SetWatcherEnabled(true));