diff --git a/src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/codeCompletion/CodeCompletionPopupKeyHandler.kt b/src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/codeCompletion/CodeCompletionPopupKeyHandler.kt
index 03aa22a..9d7c0ce 100644
--- a/src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/codeCompletion/CodeCompletionPopupKeyHandler.kt
+++ b/src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/codeCompletion/CodeCompletionPopupKeyHandler.kt
@@ -36,7 +36,7 @@ class CodeCompletionPopupKeyHandler(originalHandler: TypedActionHandler?) : Type
 		if (shortcutItem == CodeCompletionPopupConfiguration.SHORTCUT_NEXT_PAGE) {
 			setPageOffset(lookup) {
 				val newTopIndex = offset + CodeCompletionPopupConfiguration.itemShortcutCount
-				if (newTopIndex >= it.size) 0 else newTopIndex
+				if (newTopIndex >= it.size) offset else newTopIndex
 			}
 		}
 		else if (shortcutItem == CodeCompletionPopupConfiguration.SHORTCUT_PREV_PAGE) {