diff --git a/src/game/client/components/chat.cpp b/src/game/client/components/chat.cpp
index 80a4a602c..88d23caba 100644
--- a/src/game/client/components/chat.cpp
+++ b/src/game/client/components/chat.cpp
@@ -270,7 +270,7 @@ bool CChat::OnInput(IInput::CEvent Event)
 				{
 					pCompletionString = m_pClient->m_aClients[Index].m_aName;
 					m_CompletionChosen = Index+SearchType*MAX_CLIENTS;
-					m_CompletionFav = m_CompletionChosen;
+					m_CompletionFav = m_CompletionChosen%MAX_CLIENTS;
 					break;
 				}
 			}