From 6818553a0669e01446ccf28eebefbe17394f497c Mon Sep 17 00:00:00 2001
From: Eldar Abusalimov <eldar.abusalimov@jetbrains.com>
Date: Thu, 21 Mar 2019 06:34:34 +0300
Subject: [PATCH] IDEA-195094 Regression: New CTRL-E in "commit changes" breaks
 keyboard shortcuts

---
 .../intellij/openapi/vcs/actions/ShowMessageHistoryAction.kt    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowMessageHistoryAction.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowMessageHistoryAction.kt
index 2cad561dd0e0..d3fb470e00e6 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowMessageHistoryAction.kt
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowMessageHistoryAction.kt
@@ -91,6 +91,8 @@ class ShowMessageHistoryAction : DumbAwareAction() {
         }
 
         override fun onClosed(event: LightweightWindowEvent) {
+          // IDEA-195094 Regression: New CTRL-E in "commit changes" breaks keyboard shortcuts
+          commitMessage.editorField.requestFocusInWindow()
           // Use invokeLater() as onClosed() is called before callback from setItemChosenCallback
           getApplication().invokeLater { chosenMessage ?: cancelPreview(project, commitMessage) }
         }