diff --git a/platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCase.java b/platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCase.java
index 05284454c4a3..0b68ede80da8 100644
--- a/platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCase.java
+++ b/platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCase.java
@@ -20,7 +20,7 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase {
       {"BACK_SPACE",               "EditorBackSpace", "FileChooser.GoToParent"},
       {"C",                        "Uml.CollapseNodes", "JupyterNotebookCopyCellCommandModeAction"},
       {"DELETE",                   "$Delete", "DatabaseView.DropAction", "JupyterNotebookDeleteCellCommandModeAction"},
-      {"DOWN",                     "EditorDown", "Terminal.SelectBlockBelow", "Terminal.DownCommandCompletion", "JupyterSelectCellBelowCommandModeAction"},
+      {"DOWN",                     "EditorDown", "Terminal.SelectBlockBelow", "JupyterSelectCellBelowCommandModeAction"},
       {"ENTER",                    "Console.Execute", "Console.TableResult.EditValue", "DirDiffMenu.SynchronizeDiff", "EditorChooseLookupItem",
                                    "EditorEnter", "NextTemplateVariable", "Git.Log.Branches.Change.Branch.Filter", "SplitChooser.Split",
                                    "JupyterMarkdownDestroyControllerAction", "Console.TableResult.GotoReferencedResult"},
@@ -41,7 +41,7 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase {
                                    "EditorTab", "ExpandLiveTemplateByTab", "BraceOrQuoteOut", "SplitChooser.NextWindow", "InsertInlineCompletionAction",
                                    "Terminal.CommandCompletion", "CodeFloatingToolbar.GotoNextMenu", "AIAssistant.Editor.AcceptOneLineCompletion",
                                    "InlinePromptGenerateCodeAction", "InsertNextEditAction"},
-      {"UP",                       "EditorUp", "Terminal.SelectBlockAbove", "Terminal.UpCommandCompletion", "JupyterSelectCellAboveCommandModeAction"},
+      {"UP",                       "EditorUp", "Terminal.SelectBlockAbove", "JupyterSelectCellAboveCommandModeAction"},
       {"alt DOWN",                 "MethodDown", "ShowContent", "ShowSearchHistory", "JupyterNotebookMoveCellDownCommandModeAction", "NotebookMoveCellDownAction"},
       {"alt ENTER",                "ShowIntentionActions", "Console.TableResult.EditValue", "JupyterNotebookRunCellInsertBelowCommandModeAction",
                                    "Console.TableResult.GotoReferencedResult"},
diff --git a/plugins/terminal/frontend/resources/intellij.terminal.frontend.xml b/plugins/terminal/frontend/resources/intellij.terminal.frontend.xml
index 72873b3bcafe..3878f854fa42 100644
--- a/plugins/terminal/frontend/resources/intellij.terminal.frontend.xml
+++ b/plugins/terminal/frontend/resources/intellij.terminal.frontend.xml
@@ -96,11 +96,13 @@
             use-shortcut-of="EditorChooseLookupItem">
       <override-text place="GoToAction"/>
     </action>
-    <action id="Terminal.UpCommandCompletion" class="com.intellij.terminal.frontend.action.TerminalCompletionUpAction">
-      <keyboard-shortcut first-keystroke="UP" keymap="$default"/>
+    <action id="Terminal.CommandCompletion.SelectSuggestionAbove" class="com.intellij.terminal.frontend.action.TerminalCompletionUpAction"
+            use-shortcut-of="EditorUp">
+      <override-text place="GoToAction"/>
     </action>
-    <action id="Terminal.DownCommandCompletion" class="com.intellij.terminal.frontend.action.TerminalCompletionDownAction">
-      <keyboard-shortcut first-keystroke="DOWN" keymap="$default"/>
+    <action id="Terminal.CommandCompletion.SelectSuggestionBelow" class="com.intellij.terminal.frontend.action.TerminalCompletionDownAction"
+            use-shortcut-of="EditorDown">
+      <override-text place="GoToAction"/>
     </action>
     <action id="Terminal.Escape" class="com.intellij.terminal.frontend.action.TerminalEscapeAction" use-shortcut-of="EditorEscape"/>
     <action id="Terminal.OpenInReworkedTerminal" class="com.intellij.terminal.frontend.action.RevealFileInReworkedTerminalAction"
diff --git a/plugins/terminal/frontend/src/com/intellij/terminal/frontend/view/impl/TerminalEventDispatcher.kt b/plugins/terminal/frontend/src/com/intellij/terminal/frontend/view/impl/TerminalEventDispatcher.kt
index 86c9de9e59dd..6d274ed9f25d 100644
--- a/plugins/terminal/frontend/src/com/intellij/terminal/frontend/view/impl/TerminalEventDispatcher.kt
+++ b/plugins/terminal/frontend/src/com/intellij/terminal/frontend/view/impl/TerminalEventDispatcher.kt
@@ -238,8 +238,8 @@ private class TerminalEventDispatcher(
       "Terminal.Find",
       "Terminal.CommandCompletion.Invoke",
       "Terminal.CommandCompletion.InsertSuggestion",
-      "Terminal.UpCommandCompletion",
-      "Terminal.DownCommandCompletion",
+      "Terminal.CommandCompletion.SelectSuggestionAbove",
+      "Terminal.CommandCompletion.SelectSuggestionBelow",
       "Terminal.InsertInlineCompletion",
     )
 
diff --git a/plugins/terminal/resources/messages/TerminalBundle.properties b/plugins/terminal/resources/messages/TerminalBundle.properties
index 172ca0392584..ded5cc402212 100644
--- a/plugins/terminal/resources/messages/TerminalBundle.properties
+++ b/plugins/terminal/resources/messages/TerminalBundle.properties
@@ -37,8 +37,10 @@ action.Terminal.CommandCompletion.Invoke.text=Call Command Completion
 action.Terminal.CommandCompletion.Invoke.GoToAction.text=Call Command Completion (Terminal)
 action.Terminal.CommandCompletion.InsertSuggestion.text=Insert Command Completion Suggestion
 action.Terminal.CommandCompletion.InsertSuggestion.GoToAction.text=Insert Command Completion Suggestion (Terminal)
-action.Terminal.UpCommandCompletion.text=Terminal Completion Up
-action.Terminal.DownCommandCompletion.text=Terminal Completion Down
+action.Terminal.CommandCompletion.SelectSuggestionAbove.text=Select Suggestion Above
+action.Terminal.CommandCompletion.SelectSuggestionAbove.GoToAction.text=Select Suggestion Above (Terminal)
+action.Terminal.CommandCompletion.SelectSuggestionBelow.text=Select Suggestion Below
+action.Terminal.CommandCompletion.SelectSuggestionBelow.GoToAction.text=Select Suggestion Below (Terminal)
 action.Terminal.InsertInlineCompletion.text=Insert Inline Proposal
 action.Terminal.InsertInlineCompletion.GoToAction.text=Insert Inline Proposal (Terminal)
 action.Terminal.ShowDocumentation.text=Show Documentation
diff --git a/plugins/terminal/tests/src/com/intellij/terminal/tests/reworked/frontend/completion/TerminalCompletionFixture.kt b/plugins/terminal/tests/src/com/intellij/terminal/tests/reworked/frontend/completion/TerminalCompletionFixture.kt
index 9743eaa84097..5604eeafac6b 100644
--- a/plugins/terminal/tests/src/com/intellij/terminal/tests/reworked/frontend/completion/TerminalCompletionFixture.kt
+++ b/plugins/terminal/tests/src/com/intellij/terminal/tests/reworked/frontend/completion/TerminalCompletionFixture.kt
@@ -106,11 +106,11 @@ class TerminalCompletionFixture(val project: Project, val testRootDisposable: Di
   }
 
   fun downCompletionPopup() {
-    runActionById("Terminal.DownCommandCompletion")
+    runActionById("Terminal.CommandCompletion.SelectSuggestionBelow")
   }
 
   fun upCompletionPopup() {
-    runActionById("Terminal.UpCommandCompletion")
+    runActionById("Terminal.CommandCompletion.SelectSuggestionAbove")
   }
 
   /**