diff --git a/ClassicalSharp/2D/Widgets/Menu/MenuInputValidator.cs b/ClassicalSharp/2D/Widgets/Menu/MenuInputValidator.cs
index 19bf1c0fb..cf099f76d 100644
--- a/ClassicalSharp/2D/Widgets/Menu/MenuInputValidator.cs
+++ b/ClassicalSharp/2D/Widgets/Menu/MenuInputValidator.cs
@@ -26,13 +26,13 @@ namespace ClassicalSharp {
 		}
 		
 		public override bool IsValidChar( char c ) {
-			return (c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') 
+			return (c >= '0' && c <= '9') || (c >= 'A' && c <= 'F')
 				|| (c >= 'a' && c <= 'f');
 		}
 		
 		public override bool IsValidString( string s ) {
 			return s.Length <= 6;
-		}	
+		}
 		
 		public override bool IsValidValue( string s ) {
 			FastColour col;
@@ -99,8 +99,8 @@ namespace ClassicalSharp {
 		}
 		
 		public override bool IsValidChar( char c ) {
-			return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == ' ' ||
-				(c >= '0' && c <= '9');
+			return !(c == '/' || c == '\\' || c == '?' || c == '*' || c == ':'
+			         || c == '<' || c == '>' || c == '|' || c == '"');
 		}
 		
 		public override bool IsValidString( string s ) {
@@ -120,7 +120,7 @@ namespace ClassicalSharp {
 		
 		public override bool IsValidString( string s ) {
 			return s.Length <= 3;
-		}	
+		}
 		
 		public override bool IsValidValue( string s ) {
 			return s == "yes" || s == "no";
diff --git a/ClassicalSharp/2D/Widgets/Menu/MenuInputWidget.cs b/ClassicalSharp/2D/Widgets/Menu/MenuInputWidget.cs
index 7cb1a5b6d..f1a9373e3 100644
--- a/ClassicalSharp/2D/Widgets/Menu/MenuInputWidget.cs
+++ b/ClassicalSharp/2D/Widgets/Menu/MenuInputWidget.cs
@@ -107,6 +107,7 @@ namespace ClassicalSharp {
 		static bool IsInvalidChar( char c ) {
 			// Make sure we're in the printable text range from 0x20 to 0x7E
 			return c < ' ' || c == '&' || c > '~';
+			// TODO: Uncomment this for full unicode support for save level screen?
 		}
 		
 		public override bool HandlesKeyPress( char key ) {