diff --git a/stepmania/src/Font.cpp b/stepmania/src/Font.cpp
index 28aaf67145..0e7866e9f0 100644
--- a/stepmania/src/Font.cpp
+++ b/stepmania/src/Font.cpp
@@ -658,6 +658,10 @@ void Font::LoadFontPageSettings(FontPageSettings &cfg, IniFile &ini, const CStri
 		cfg.MapRange("ascii", 0, 0, -1);
 	else if(cfg.CharToGlyphNo.empty() && NumFrames == 256)
 		cfg.MapRange("cp1252", 0, 0, -1);
+
+	/* If ' ' is set and nbsp is not, set nbsp. */
+	if( cfg.CharToGlyphNo.find(' ') != cfg.CharToGlyphNo.end() )
+		cfg.CharToGlyphNo[0x00A0] = cfg.CharToGlyphNo[' '];
 }
 
 CString FontPageSettings::MapRange(CString Mapping, int map_offset, int glyphno, int cnt)
diff --git a/stepmania/src/FontCharAliases.cpp b/stepmania/src/FontCharAliases.cpp
index edf4f4fc6b..98b891d4a4 100644
--- a/stepmania/src/FontCharAliases.cpp
+++ b/stepmania/src/FontCharAliases.cpp
@@ -257,6 +257,8 @@ static void InitCharAliases()
 		{ "kdot",	0x30FB }, /* ・ */
 		{ "kdash",	0x30FC }, /* ー */
 
+		{ "nbsp",	0x00a0 }, /* Non-breaking space */
+
 		/* Symbols: */
 		{ "omega",	0x03a9 }, /* Ω */
 		{ "whiteheart",	0x2661 }, /* ♡ */