Index: binaries/data/mods/public/gui/gamesetup/gamesetup.xml
===================================================================
--- binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -169,7 +169,7 @@
 			<!-- Chat window -->
 			<object name="chatPanel" size="24 346 100%-795 100%-60" type="image" sprite="ModernDarkBoxGold">
 				<object name="chatText" size="2 2 100%-2 100%-28" type="text" style="ChatPanel"/>
-				<object name="chatInput" size="4 100%-26 100%-96 100%-4" type="input" style="ModernInput"/>
+				<object name="chatInput" size="4 100%-26 100%-96 100%-4" type="input" style="ModernInput" max_length="1024"/>
 
 				<object size="100%-92 100%-26 100%-4 100%-4" type="button" style="StoneButton">
 					<translatableAttribute id="caption">Send</translatableAttribute>
Index: binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.xml
===================================================================
--- binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.xml
+++ binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.xml
@@ -83,7 +83,7 @@
 					<translatableAttribute id="caption">Server Name:</translatableAttribute>
 				</object>
 
-				<object name="hostServerName" type="input" size="50%+10 40 100%-20 64" style="ModernInput">
+				<object name="hostServerName" type="input" size="50%+10 40 100%-20 64" style="ModernInput" max_length="256">
 					<action on="Load">
 						this.caption = getDefaultGameName();
 					</action>
Index: binaries/data/mods/public/gui/lobby/lobby_panels.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/lobby_panels.xml
+++ binaries/data/mods/public/gui/lobby/lobby_panels.xml
@@ -251,7 +251,7 @@
 
 		<object name="chatPanel" size="0 49% 100% 100%" type="image" sprite="ModernDarkBoxGold">
 			<object name="chatText" size="0 0 100% 100%-28" type="text" style="ChatPanel" font="sans-13"/>
-			<object name="chatInput" size="0 100%-26 100%-72 100%-4" type="input" style="ModernInput" font="sans-13">
+			<object name="chatInput" size="0 100%-26 100%-72 100%-4" type="input" style="ModernInput" font="sans-13" max_length="1024">
 				<action on="Press">submitChatInput();</action>
 				<action on="Tab">
 					autoCompleteText(this, Engine.GetPlayerList().map(player => player.name));
Index: source/gui/ObjectTypes/CInput.cpp
===================================================================
--- source/gui/ObjectTypes/CInput.cpp
+++ source/gui/ObjectTypes/CInput.cpp
@@ -134,6 +134,10 @@
 		// Text has been committed, either single key presses or through an IME
 		std::wstring text = wstring_from_utf8(ev->ev.text.text);
 
+		// Check max length
+		if (m_MaxLength != 0 && static_cast<int>(m_Caption.length()) >= m_MaxLength)
+			return IN_HANDLED;
+
 		m_WantedX = 0.0f;
 
 		if (SelectingText())
@@ -321,7 +325,7 @@
 		if (cooked == 0)
 			return;
 
-		// check max length
+		// Check max length
 		if (m_MaxLength != 0 && static_cast<int>(m_Caption.length()) >= m_MaxLength)
 			break;
 
@@ -602,6 +606,10 @@
 			if (SelectingText())
 				DeleteCurSelection();
 
+			// Check max length
+			if (m_MaxLength != 0 && static_cast<int>(m_Caption.length()) >= m_MaxLength)
+				return IN_HANDLED;
+
 			if (m_iBufferPos == static_cast<int>(m_Caption.length()))
 				m_Caption += text;
 			else