diff --git a/platform/vcs-impl/shared/src/com/intellij/openapi/vcs/changes/CommitChangesViewWithToolbarPanel.kt b/platform/vcs-impl/shared/src/com/intellij/openapi/vcs/changes/CommitChangesViewWithToolbarPanel.kt
index 772547d6a5fa..a470eae3b73d 100644
--- a/platform/vcs-impl/shared/src/com/intellij/openapi/vcs/changes/CommitChangesViewWithToolbarPanel.kt
+++ b/platform/vcs-impl/shared/src/com/intellij/openapi/vcs/changes/CommitChangesViewWithToolbarPanel.kt
@@ -84,6 +84,7 @@ class CommitChangesViewWithToolbarPanel(
       }
     }
 
+    changesView.isShowCheckboxes = true
     changesView.installPopupHandler(
       ActionManager.getInstance().getAction("ChangesViewPopupMenuShared") as ActionGroup
     )
diff --git a/platform/vcs-impl/src/com/intellij/vcs/commit/ChangesViewCommitPanel.kt b/platform/vcs-impl/src/com/intellij/vcs/commit/ChangesViewCommitPanel.kt
index 71a8ec7eaac5..e6dc86fdb719 100644
--- a/platform/vcs-impl/src/com/intellij/vcs/commit/ChangesViewCommitPanel.kt
+++ b/platform/vcs-impl/src/com/intellij/vcs/commit/ChangesViewCommitPanel.kt
@@ -46,7 +46,6 @@ class ChangesViewCommitPanel internal constructor(
     changesView.viewModel.setInclusionListener {
       WriteIntentReadAction.run { fireInclusionChanged() }
     }
-    changesView.viewModel.setShowCheckboxes(true)
 
     commitActionsPanel.isCommitButtonDefault = {
       !progressPanel.isDumbMode && UIUtil.isFocusAncestor(rootComponent ?: component)