diff --git a/src/mathed/InsetMathChar.cpp b/src/mathed/InsetMathChar.cpp
index 8832a751a8..e1d64ec866 100644
--- a/src/mathed/InsetMathChar.cpp
+++ b/src/mathed/InsetMathChar.cpp
@@ -172,6 +172,11 @@ void InsetMathChar::mathmlize(MathStream & ms) const
 		case '<': entity = "&lt;"; break;
 		case '>': entity = "&gt;"; break;
 		case '&': entity = "&amp;"; break;
+		case ' ': 
+			if (!ms.inText())
+				break;
+			entity = "&ThinSpace;";
+			break;
 		default: break;
 	}