2 files changed, 5 insertions, 1 deletions
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index 742181eef..2cbd100e2 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -72,7 +72,8 @@ InputManager::InputManager() :
     mSetupInput(nullptr),
     mNewKeyIndex(InputAction::NO_VALUE),
     mMask(1),
-    mNameMap()
+    mNameMap(),
+    mChatMap()
 {
 }
 
@@ -156,6 +157,8 @@ void InputManager::retrieve()
                 }
             }
         }
+        if (!inputActionData[i].chatCommand.empty())
+            mChatMap[i] = i;
     }
 }
 
diff --git a/src/input/inputmanager.h b/src/input/inputmanager.h
index 02bc0315b..1635bf03c 100644
--- a/src/input/inputmanager.h
+++ b/src/input/inputmanager.h
@@ -130,6 +130,7 @@ class InputManager final
         int mMask;
 
         std::map<std::string, int> mNameMap;
+        std::map<std::string, int> mChatMap;
 
         InputFunction mKey[InputAction::TOTAL];
 };