diff --git a/client/src/modes/general/navigation.rs b/client/src/modes/general/navigation.rs
index 3692dd7..3a26027 100644
--- a/client/src/modes/general/navigation.rs
+++ b/client/src/modes/general/navigation.rs
@@ -79,7 +79,7 @@ pub async fn handle_navigation_event(
 }
 
 pub fn move_up(app_state: &mut AppState, auth_state: &mut AuthState) {
-    if app_state.ui.focus_outside_canvas && app_state.ui.show_login {
+    if app_state.ui.focus_outside_canvas && app_state.ui.show_login || app_state.ui.show_register{
         if app_state.general.selected_item == 0 {
             app_state.ui.focus_outside_canvas = false;
             let last_field_index = auth_state.fields().len().saturating_sub(1);
@@ -106,7 +106,7 @@ pub fn move_up(app_state: &mut AppState, auth_state: &mut AuthState) {
 }
 
 pub fn move_down(app_state: &mut AppState) {
-    if app_state.ui.focus_outside_canvas && app_state.ui.show_login {
+    if app_state.ui.focus_outside_canvas && app_state.ui.show_login || app_state.ui.show_register {
         let num_general_elements = 2;
         if app_state.general.selected_item < num_general_elements - 1 {
             app_state.general.selected_item += 1;