diff --git a/gui/src/hooks/useInputHistory.ts b/gui/src/hooks/useInputHistory.ts
index 3d63886fe9a..a2b2ed9aa0b 100644
--- a/gui/src/hooks/useInputHistory.ts
+++ b/gui/src/hooks/useInputHistory.ts
@@ -54,7 +54,7 @@ export function useInputHistory(historyKey: string) {
       return;
     }
 
-    setCurrentIndex(inputHistory.length + 1);
+    setCurrentIndex(Math.min(inputHistory.length + 1, MAX_HISTORY_LENGTH));
     setInputHistory((prev) => {
       return [...prev, inputValue].slice(-MAX_HISTORY_LENGTH);
     });