diff --git a/code/renderer/tr_gui.cpp b/code/renderer/tr_gui.cpp
index d6191b1..dfb95fd 100644
--- a/code/renderer/tr_gui.cpp
+++ b/code/renderer/tr_gui.cpp
@@ -1744,7 +1744,7 @@ static bool AutoCompleteShaderKeyword(ShaderEditWindow& window, ImGuiInputTextCa
 
 		const char* const token = Cmd_Argv(t);
 
-		if(t != tokenIndex)
+		if(t < tokenIndex)
 		{
 			// when not processing the selected token, we only accept exact matches
 			for(int p = 0; p < patternCount; p++)
@@ -1757,6 +1757,7 @@ static bool AutoCompleteShaderKeyword(ShaderEditWindow& window, ImGuiInputTextCa
 					break;
 				}
 			}
+			continue;
 		}
 
 		// we're processing the selected token,