diff --git a/CHANGELOG.md b/CHANGELOG.md
index f321c29..17ea633 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+
+### Fixed
+
+- Fixes up/down order of the alternate shortcuts on the Interactive Rebase Editor
+
 ## [11.5.0] - 2021-06-14
 
 ### Added
diff --git a/src/webviews/apps/rebase/rebase.ts b/src/webviews/apps/rebase/rebase.ts
index 22158b4..d949608 100644
--- a/src/webviews/apps/rebase/rebase.ts
+++ b/src/webviews/apps/rebase/rebase.ts
@@ -183,7 +183,7 @@ class RebaseEditor extends App<RebaseState> {
 
 						e.preventDefault();
 
-						let index = me.getEntryIndex(ref) + (e.key === 'k' ? 1 : -1);
+						let index = me.getEntryIndex(ref) + (e.key === 'j' ? 1 : -1);
 						if (index < 0) {
 							index = me.state.entries.length - 1;
 						} else if (index === me.state.entries.length) {
@@ -199,7 +199,7 @@ class RebaseEditor extends App<RebaseState> {
 						if (ref) {
 							e.stopPropagation();
 
-							me.moveEntry(ref, e.key === 'K' ? 1 : -1, true);
+							me.moveEntry(ref, e.key === 'J' ? 1 : -1, true);
 						}
 					}
 				} else if (!e.metaKey && !e.altKey && !e.ctrlKey) {