diff --git a/settings.py b/settings.py
index 1430d6c..7b67058 100644
--- a/settings.py
+++ b/settings.py
@@ -120,13 +120,14 @@ def settings_menu(stdscr, interface):
 
         if key == curses.KEY_UP:
             old_selected_index = selected_index
-            selected_index = max(0, selected_index - 1)
+            max_index = len(options) + (1 if show_save_option else 0) - 1
+            selected_index = max_index if selected_index == 0 else selected_index - 1
             move_highlight(old_selected_index, selected_index, options, show_save_option, menu_win)
             
         elif key == curses.KEY_DOWN:
             old_selected_index = selected_index
             max_index = len(options) + (1 if show_save_option else 0) - 1
-            selected_index = min(max_index, selected_index + 1)
+            selected_index = 0 if selected_index == max_index else selected_index + 1
             move_highlight(old_selected_index, selected_index, options, show_save_option, menu_win)
 
         elif key == curses.KEY_RIGHT or key == ord('\n'):