diff --git a/src/MacVim/MMBackend.m b/src/MacVim/MMBackend.m
index 615a3c6dba..c6321b54de 100644
--- a/src/MacVim/MMBackend.m
+++ b/src/MacVim/MMBackend.m
@@ -835,6 +835,12 @@ enum {
         } else if ([components count] > 2) {
             parseFailed = YES;
         }
+
+        if (!parseFailed) {
+            // Replace underscores with spaces.
+            fontName = [[fontName componentsSeparatedByString:@"_"]
+                                     componentsJoinedByString:@" "];
+        }
     }
 
     if (!parseFailed && [fontName length] > 0) {