diff --git a/src/MacVim/MMCoreTextView.m b/src/MacVim/MMCoreTextView.m
index cc547ce1ba..55c5b04292 100644
--- a/src/MacVim/MMCoreTextView.m
+++ b/src/MacVim/MMCoreTextView.m
@@ -409,6 +409,12 @@ static void grid_free(Grid *grid) {
         [fontWide release];
         fontWide = [newFont retain];
     }
+
+    [self clearAll];
+    [fontVariants removeAllObjects];
+    [characterStrings removeAllObjects];
+    [characterLines removeAllObjects];
+
 }
 
 - (NSFont *)font