diff --git a/platform/vcs-impl/src/com/intellij/vcs/commit/ChangesViewCommitWorkflowHandler.kt b/platform/vcs-impl/src/com/intellij/vcs/commit/ChangesViewCommitWorkflowHandler.kt
index f4d61cd35e64..0355a9055032 100644
--- a/platform/vcs-impl/src/com/intellij/vcs/commit/ChangesViewCommitWorkflowHandler.kt
+++ b/platform/vcs-impl/src/com/intellij/vcs/commit/ChangesViewCommitWorkflowHandler.kt
@@ -73,6 +73,8 @@ class ChangesViewCommitWorkflowHandler(
 
       workflow.initCommitOptions(createCommitOptions())
       commitOptions.restoreState()
+
+      currentChangeList?.let { commitOptions.changeListChanged(it) }
     }
     return commitOptions
   }
@@ -175,6 +177,8 @@ class ChangesViewCommitWorkflowHandler(
 
     val newCommitMessage = newChangeList?.let { commitMessagePolicy.getCommitMessage(it) { getIncludedChanges() } }
     setCommitMessage(newCommitMessage)
+
+    newChangeList?.let { commitOptions.changeListChanged(it) }
   }
 
   override fun inclusionChanged() {