diff --git a/src/ct_chat.cpp b/src/ct_chat.cpp
index 73c77e6d1..3a18dcb2b 100644
--- a/src/ct_chat.cpp
+++ b/src/ct_chat.cpp
@@ -508,6 +508,7 @@ CCMD (messagemode)
 {
 	if (menuactive == MENU_Off)
 	{
+		buttonMap.ResetButtonStates();
 		chatmodeon = 1;
 		C_HideConsole ();
 		CT_ClearChatMessage ();
@@ -530,6 +531,7 @@ CCMD (messagemode2)
 {
 	if (menuactive == MENU_Off)
 	{
+		buttonMap.ResetButtonStates();
 		chatmodeon = 2;
 		C_HideConsole ();
 		CT_ClearChatMessage ();