Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatPanel.xml
===================================================================
--- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatPanel.xml
+++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatPanel.xml
@@ -3,7 +3,7 @@
 
 	<object name="chatText" type="text" size="2 2 100%-2 100%-28" style="ChatPanel"/>
 
-	<object name="chatInput" type="input" size="4 100%-26 100%-96 100%-4" style="ModernInput"/>
+	<object name="chatInput" type="input" size="4 100%-26 100%-96 100%-4" style="ModernInput" max_length="1024"/>
 
 	<object name="chatSubmitButton" 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/LobbyPage/Chat/ChatPanel.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatPanel.xml
+++ binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatPanel.xml
@@ -7,7 +7,7 @@
 	<script directory="gui/lobby/LobbyPage/Chat/SystemMessages/"/>
 
 	<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"/>
 	<object name="chatSubmit" size="100%-72 100%-26 100%-4 100%-4" type="button" style="StoneButton">
 		<translatableAttribute id="caption">Send</translatableAttribute>
 	</object>
Index: binaries/data/mods/public/gui/session/chat/chat_window.xml
===================================================================
--- binaries/data/mods/public/gui/session/chat/chat_window.xml
+++ binaries/data/mods/public/gui/session/chat/chat_window.xml
@@ -64,6 +64,7 @@
 			name="chatInput"
 			size="75 100%-76 100%-16 100%-52"
 			style="ModernInput"
+			max_length="1024"
 		/>
 
 		<!-- Cancel Button -->
Index: source/gui/ObjectTypes/CInput.cpp
===================================================================
--- source/gui/ObjectTypes/CInput.cpp
+++ source/gui/ObjectTypes/CInput.cpp
@@ -137,6 +137,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 && m_Caption.length() + text.length() > static_cast<size_t>(m_MaxLength))
+			return IN_HANDLED;
+
 		m_WantedX = 0.0f;
 
 		if (SelectingText())
@@ -324,8 +328,8 @@
 		if (cooked == 0)
 			return;
 
-		// check max length
-		if (m_MaxLength != 0 && static_cast<int>(m_Caption.length()) >= m_MaxLength)
+		// Check max length
+		if (m_MaxLength != 0 && m_Caption.length() >= static_cast<size_t>(m_MaxLength))
 			break;
 
 		m_WantedX = 0.0f;
@@ -606,6 +610,10 @@
 		std::wstring text = wstring_from_utf8(utf8_text);
 		SDL_free(utf8_text);
 
+		// Check max length
+		if (m_MaxLength != 0 && m_Caption.length() + text.length() > static_cast<size_t>(m_MaxLength))
+			text = text.substr(0, static_cast<size_t>(m_MaxLength) - m_Caption.length());
+
 		if (SelectingText())
 			DeleteCurSelection();