diff --git a/src/components/diff.rs b/src/components/diff.rs
index cb7c9dd4..4822d775 100644
--- a/src/components/diff.rs
+++ b/src/components/diff.rs
@@ -1468,11 +1468,6 @@ impl Component for DiffComponent {
 			true,
 			self.focused(),
 		));
-		out.push(CommandInfo::new(
-			strings::commands::diff_toggle_mode(&self.key_config),
-			true,
-			self.focused(),
-		));
 
 		CommandBlocking::PassingOn
 	}
diff --git a/src/keys/key_list.rs b/src/keys/key_list.rs
index 8c32a553..f4185a37 100644
--- a/src/keys/key_list.rs
+++ b/src/keys/key_list.rs
@@ -228,7 +228,7 @@ impl Default for KeysList {
 			commit: GituiKeyEvent::new(KeyCode::Char('d'),  KeyModifiers::CONTROL),
 			newline: GituiKeyEvent::new(KeyCode::Enter,  KeyModifiers::empty()),
 			goto_line: GituiKeyEvent::new(KeyCode::Char('L'),  KeyModifiers::SHIFT),
-			diff_mode_toggle: GituiKeyEvent::new(KeyCode::Char('p'),  KeyModifiers::ALT),
+			diff_mode_toggle: GituiKeyEvent::new(KeyCode::Char('m'),  KeyModifiers::empty()),
 		}
 	}
 }
diff --git a/src/popups/compare_commits.rs b/src/popups/compare_commits.rs
index 11a5f9ff..abb7adb9 100644
--- a/src/popups/compare_commits.rs
+++ b/src/popups/compare_commits.rs
@@ -95,17 +95,17 @@ impl Component for CompareCommitsPopup {
 				!self.diff.focused() || force_all,
 			));
 
-			out.push(CommandInfo::new(
-				strings::commands::diff_focus_left(&self.key_config),
-				true,
-				self.diff.focused() || force_all,
-			));
-
 			out.push(CommandInfo::new(
 				strings::commands::diff_toggle_mode(&self.key_config),
 				true,
 				true,
 			));
+
+			out.push(CommandInfo::new(
+				strings::commands::diff_focus_left(&self.key_config),
+				true,
+				self.diff.focused() || force_all,
+			));
 		}
 
 		visibility_blocking(self)
diff --git a/src/popups/file_revlog.rs b/src/popups/file_revlog.rs
index 337188ca..101124f0 100644
--- a/src/popups/file_revlog.rs
+++ b/src/popups/file_revlog.rs
@@ -615,6 +615,11 @@ impl Component for FileRevlogPopup {
 				)
 				.order(1),
 			);
+			out.push(CommandInfo::new(
+				strings::commands::diff_toggle_mode(&self.key_config),
+				true,
+				true,
+			));
 
 			out.push(CommandInfo::new(
 				strings::commands::diff_focus_right(&self.key_config),
@@ -626,11 +631,6 @@ impl Component for FileRevlogPopup {
 				true,
 				self.diff.focused(),
 			));
-			out.push(CommandInfo::new(
-				strings::commands::diff_toggle_mode(&self.key_config),
-				true,
-				true,
-			));
 		}
 
 		visibility_blocking(self)
diff --git a/vim_style_key_config.ron b/vim_style_key_config.ron
index ca9e2d57..d61c5a4f 100644
--- a/vim_style_key_config.ron
+++ b/vim_style_key_config.ron
@@ -32,7 +32,7 @@
     diff_stage_lines: Some(( code: Char('s'), modifiers: "")),
 
     // toggle between unified and side-by-side diff mode
-    diff_mode_toggle: Some(( code: Char('p'), modifiers: "ALT")),
+    diff_mode_toggle: Some(( code: Char('m'), modifiers: "")),
 
     stashing_save: Some(( code: Char('w'), modifiers: "")),
     stashing_toggle_index: Some(( code: Char('m'), modifiers: "")),