diff --git a/platform/vcs-impl/api-dump-unreviewed.txt b/platform/vcs-impl/api-dump-unreviewed.txt
index 4260bee88cbd..7c55707036b6 100644
--- a/platform/vcs-impl/api-dump-unreviewed.txt
+++ b/platform/vcs-impl/api-dump-unreviewed.txt
@@ -7643,6 +7643,7 @@ c:com.intellij.openapi.vcs.ui.CommitMessage
 - <init>(com.intellij.openapi.project.Project):V
 - <init>(com.intellij.openapi.project.Project,Z,Z,Z):V
 - <init>(com.intellij.openapi.project.Project,Z,Z,Z,java.lang.String):V
+- createToolbar(Z):javax.swing.JComponent
 - dispose():V
 - focus():V
 - getComment():java.lang.String
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java
index 6fcf8be54b3b..6ca82509525c 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java
@@ -172,7 +172,7 @@ public class CommitMessage extends JPanel implements Disposable, DataProvider, C
   }
 
   @NotNull
-  private JComponent createToolbar(boolean horizontal) {
+  public JComponent createToolbar(boolean horizontal) {
     ActionToolbar toolbar = ActionManager.getInstance().createActionToolbar("CommitMessage", getToolbarActions(), horizontal);
     toolbar.setReservePlaceAutoPopupIcon(false);
     toolbar.getComponent().setBorder(createEmptyBorder());
diff --git a/plugins/git4idea/resources/META-INF/plugin.xml b/plugins/git4idea/resources/META-INF/plugin.xml
index 5799a47a3d76..a9b8e1c09a59 100644
--- a/plugins/git4idea/resources/META-INF/plugin.xml
+++ b/plugins/git4idea/resources/META-INF/plugin.xml
@@ -51,9 +51,6 @@
     <action id="Git.Revert.In.Log" class="git4idea.revert.GitRevertAction"/>
     <action id="Git.Uncommit" class="git4idea.reset.GitUncommitAction"/>
     <action id="Git.Reword.Commit" class="git4idea.rebase.GitRewordAction"/>
-    <group id="Git.Reword.ToolbarActions">
-      <reference ref="Vcs.ShowMessageHistory" />
-    </group>
     <action id="Git.Squash.Commits" class="git4idea.rebase.log.squash.GitSquashLogAction"/>
     <action id="Git.Drop.Commits" class="git4idea.rebase.log.drop.GitDropLogAction"/>
     <action id="Git.Rename.Local.Branch" class="git4idea.ui.branch.dashboard.BranchesDashboardActions$RenameLocalBranch"/>
diff --git a/plugins/git4idea/src/git4idea/rebase/log/GitNewCommitMessageActionDialog.kt b/plugins/git4idea/src/git4idea/rebase/log/GitNewCommitMessageActionDialog.kt
index 77c587b9ba89..a2744fa43d49 100644
--- a/plugins/git4idea/src/git4idea/rebase/log/GitNewCommitMessageActionDialog.kt
+++ b/plugins/git4idea/src/git4idea/rebase/log/GitNewCommitMessageActionDialog.kt
@@ -1,8 +1,6 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package git4idea.rebase.log
 
-import com.intellij.openapi.actionSystem.ActionGroup
-import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.openapi.ui.ValidationInfo
 import com.intellij.openapi.util.Disposer
@@ -10,7 +8,6 @@ import com.intellij.openapi.vcs.VcsConfiguration
 import com.intellij.openapi.vcs.ui.CommitMessage
 import com.intellij.ui.dsl.builder.Align
 import com.intellij.ui.dsl.builder.panel
-import com.intellij.util.ui.JBDimension
 import com.intellij.util.ui.JBUI
 import com.intellij.vcs.log.VcsLogDataKeys
 import com.intellij.vcs.log.ui.VcsLogInternalDataKeys
@@ -18,8 +15,6 @@ import git4idea.findProtectedRemoteBranch
 import git4idea.i18n.GitBundle
 import git4idea.rebase.log.GitCommitEditingActionBase.Companion.findContainingBranches
 import org.jetbrains.annotations.Nls
-import java.awt.Dimension
-import javax.swing.BorderFactory
 import javax.swing.JComponent
 
 internal class GitNewCommitMessageActionDialog<T : GitCommitEditingActionBase.MultipleCommitEditingData>(
@@ -71,7 +66,7 @@ internal class GitNewCommitMessageActionDialog<T : GitCommitEditingActionBase.Mu
         label(dialogLabel)
           .resizableColumn()
           .align(Align.FILL)
-        cell(createToolbar())
+        cell(commitEditor.createToolbar(true))
       }
       row {
         cell(commitEditor)
@@ -84,15 +79,6 @@ internal class GitNewCommitMessageActionDialog<T : GitCommitEditingActionBase.Mu
     }
   }
 
-  private fun createToolbar(): JComponent {
-    val actionGroup = ActionManager.getInstance().getAction("Git.Reword.ToolbarActions") as ActionGroup
-    val toolbar = ActionManager.getInstance().createActionToolbar("GitNewCommitMessageActionDialog", actionGroup, true)
-    toolbar.setReservePlaceAutoPopupIcon(false)
-    toolbar.getComponent().setBorder(BorderFactory.createEmptyBorder())
-    toolbar.setTargetComponent(commitEditor)
-    return toolbar.getComponent()
-  }
-
   override fun getPreferredFocusedComponent() = commitEditor.editorField
 
   override fun getDimensionServiceKey() = "Git.Rebase.Log.Action.NewCommitMessage.Dialog"