diff --git a/src/renderer/cell.zig b/src/renderer/cell.zig
index 4fd93db02..1a315a0d8 100644
--- a/src/renderer/cell.zig
+++ b/src/renderer/cell.zig
@@ -101,7 +101,7 @@ pub fn fgMode(
                 break :next_cp next_cell.codepoint();
             };
             if (next_cp == 0 or
-                next_cp == ' ' or
+                isSpace(next_cp) or
                 isPowerline(next_cp))
             {
                 break :text .normal;
@@ -113,6 +113,17 @@ pub fn fgMode(
     };
 }
 
+// Some general spaces, others intentionally kept
+// to force the font to render as a fixed width.
+fn isSpace(char: u21) bool {
+    return switch (char) {
+        0x0020, // SPACE
+        0x2002, // EN SPACE
+        => true,
+        else => false,
+    };
+}
+
 // Returns true if the codepoint is a part of the Powerline range.
 fn isPowerline(char: u21) bool {
     return switch (char) {