diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
index 25ee218c67..4d444d5d49 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
@@ -785,6 +785,9 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			if (chatText == null || string.IsNullOrEmpty(chatText.Text))
 				return false;
 
+			if (chatText.Text.LastOrDefault() == ' ')
+				return false;
+
 			var suggestion = "";
 			var oneWord = !chatText.Text.Contains(' ');
 			var toComplete = oneWord