diff --git a/plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt b/plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt
index b66da9186088..e7741575811b 100644
--- a/plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt
+++ b/plugins/git4idea/src/git4idea/GitApplyChangesProcess.kt
@@ -138,6 +138,7 @@ class GitApplyChangesProcess(private val project: Project,
           waitForChangeListManagerUpdate()
 
           if (mergeCompleted) {
+            LOG.debug("All conflicts resolved, will show commit dialog.")
             val committed = commit(repository, commit, commitMessage, changeList, successfulCommits,
                                    alreadyPicked)
             if (!committed) return false
@@ -198,10 +199,12 @@ class GitApplyChangesProcess(private val project: Project,
     }
     val changes = actualList.changes
     if (changes.isEmpty()) {
+      LOG.debug("No changes in the $actualList. All changes in the CLM: ${changeListManager.allChanges}")
       alreadyPicked.add(commit)
       return true
     }
 
+    LOG.debug("Showing commit dialog for changes: ${changes}")
     val committed = showCommitDialogAndWaitForCommit(repository, changeList, commitMessage, changes)
     if (committed) {
       refreshVfsAndMarkDirty(changes)
diff --git a/plugins/git4idea/tests/git4idea/cherrypick/GitCherryPickAutoCommitTest.kt b/plugins/git4idea/tests/git4idea/cherrypick/GitCherryPickAutoCommitTest.kt
index cdbc1cfd6753..b564ace8a888 100644
--- a/plugins/git4idea/tests/git4idea/cherrypick/GitCherryPickAutoCommitTest.kt
+++ b/plugins/git4idea/tests/git4idea/cherrypick/GitCherryPickAutoCommitTest.kt
@@ -74,6 +74,7 @@ class GitCherryPickAutoCommitTest : GitCherryPickTest() {
     cherryPick(commit)
 
     `assert merge dialog was shown`()
+    `assert commit dialog was shown`()
     changeListManager.assertChangeListExists("on_master\n\n(cherry picked from commit ${shortHash(commit)})")
     assertNoNotification()
   }