diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index d460e70e297f9a3939e238074841e78a2c119f4e..aebcb0ebe55a22ce10ccc1f09d0a3b68c587eb90 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -648,12 +648,13 @@ public:
 
     ~ConflictHandler()
     {
+        GitClient *client = GitPlugin::instance()->gitClient();
         if (m_commit.isEmpty()) {
             GitPlugin::instance()->gitVersionControl()->emitRepositoryChanged(m_workingDirectory);
-            GitPlugin::instance()->gitClient()->endStashScope(m_workingDirectory);
+            if (client->checkCommandInProgress(m_workingDirectory) != GitClient::NoCommand)
+                client->endStashScope(m_workingDirectory);
         } else {
-            GitPlugin::instance()->gitClient()->handleMergeConflicts(
-                        m_workingDirectory, m_commit, m_command);
+            client->handleMergeConflicts(m_workingDirectory, m_commit, m_command);
         }
     }