diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp
index 8d0bdb16f..d625d4c0d 100644
--- a/src/game/client/components/menus.cpp
+++ b/src/game/client/components/menus.cpp
@@ -1311,6 +1311,9 @@ int CMenus::Render()
 			if(DoButton_Menu(&s_Button, pButtonText, 0, &Part) || m_EscapePressed || m_EnterPressed)
 				m_Popup = POPUP_NONE;
 		}
+
+		if(m_Popup == POPUP_NONE)
+			UI()->SetActiveItem(0);
 	}
 
 	return 0;