diff --git a/src/controller/input.rs b/src/controller/input.rs
index be6eec5..0f11136 100644
--- a/src/controller/input.rs
+++ b/src/controller/input.rs
@@ -118,8 +118,6 @@ pub fn handle_key(key: KeyEvent, state: &mut AppStateRest) -> Vec<Action> {
                 state.input.cycle_autocomplete(false);
                 state.dirty = true;
                 Vec::new()
-            } else if key.modifiers.contains(KeyModifiers::CONTROL) {
-                vec![Action::HistoryUp]
             } else if state.misc.overlay == Overlay::Effort {
                 mode::effort::cycle_effort(state);
                 Vec::new()
@@ -135,8 +133,10 @@ pub fn handle_key(key: KeyEvent, state: &mut AppStateRest) -> Vec<Action> {
                 state.dirty = true;
                 Vec::new()
 
-            } else {
+            } else if key.modifiers.contains(KeyModifiers::CONTROL) {
                 vec![Action::ScrollUp]
+            } else {
+                vec![Action::HistoryUp]
             }
         }
         KeyCode::Down => {
@@ -144,8 +144,6 @@ pub fn handle_key(key: KeyEvent, state: &mut AppStateRest) -> Vec<Action> {
                 state.input.cycle_autocomplete(true);
                 state.dirty = true;
                 Vec::new()
-            } else if key.modifiers.contains(KeyModifiers::CONTROL) {
-                vec![Action::HistoryDown]
             } else if state.misc.overlay == Overlay::Effort {
                 mode::effort::cycle_effort(state);
                 Vec::new()
@@ -161,8 +159,10 @@ pub fn handle_key(key: KeyEvent, state: &mut AppStateRest) -> Vec<Action> {
                 state.dirty = true;
                 Vec::new()
 
-            } else {
+            } else if key.modifiers.contains(KeyModifiers::CONTROL) {
                 vec![Action::ScrollDown]
+            } else {
+                vec![Action::HistoryDown]
             }
         }
         KeyCode::PageUp => {