diff --git a/scintilla/src/AutoComplete.cxx b/scintilla/src/AutoComplete.cxx
index 7a8b6b201..d042c19e6 100644
--- a/scintilla/src/AutoComplete.cxx
+++ b/scintilla/src/AutoComplete.cxx
@@ -219,9 +219,9 @@ void AutoComplete::Move(int delta) {
 	int current = lb->GetSelection();
 	current += delta;
 	if (current >= count)
-		current = count - 1;
+		current = (current == count ? 0 : count - 1);
 	if (current < 0)
-		current = 0;
+		current = (current == -1 ? count - 1 : 0);
 	lb->Select(current);
 }