diff --git a/MMTextView.h b/MMTextView.h
index cbe242556f..69ea8ba0aa 100644
--- a/MMTextView.h
+++ b/MMTextView.h
@@ -32,5 +32,6 @@
 - (void)setShouldDrawInsertionPoint:(BOOL)on;
 - (void)drawInsertionPointAtRow:(int)row column:(int)col shape:(int)shape
                        fraction:(int)percent color:(NSColor *)color;
+- (void)hideMarkedTextField;
 
 @end
diff --git a/MMTextView.m b/MMTextView.m
index d97c9fa3c0..59f91404dc 100644
--- a/MMTextView.m
+++ b/MMTextView.m
@@ -34,7 +34,6 @@ static float MMDragAreaSize = 73.0f;
 - (MMVimController *)vimController;
 - (void)startDragTimerWithInterval:(NSTimeInterval)t;
 - (void)dragTimerFired:(NSTimer *)timer;
-- (void)hideMarkedTextField;
 - (void)sendKeyDown:(const char *)chars length:(int)len modifiers:(int)flags;
 @end
 
@@ -90,6 +89,15 @@ static float MMDragAreaSize = 73.0f;
     [self setInsertionPointColor:color];
 }
 
+- (void)hideMarkedTextField
+{
+    if (markedTextField) {
+        NSWindow *win = [markedTextField window];
+        [win close];
+        [markedTextField setStringValue:@""];
+    }
+}
+
 - (void)drawRect:(NSRect)rect
 {
     [super drawRect:rect];
@@ -883,15 +891,6 @@ static float MMDragAreaSize = 73.0f;
     ++tick;
 }
 
-- (void)hideMarkedTextField
-{
-    if (markedTextField) {
-        NSWindow *win = [markedTextField window];
-        [win close];
-        [markedTextField setStringValue:@""];
-    }
-}
-
 - (void)sendKeyDown:(const char *)chars length:(int)len modifiers:(int)flags
 {
     if (chars && len > 0) {
diff --git a/MMWindowController.m b/MMWindowController.m
index f653eae78b..67c2d98846 100644
--- a/MMWindowController.m
+++ b/MMWindowController.m
@@ -627,6 +627,9 @@ NSMutableArray *buildMenuAddress(NSMenu *menu)
 - (void)windowDidResignMain:(NSNotification *)notification
 {
     [vimController sendMessage:LostFocusMsgID data:nil wait:NO];
+
+    if (textView)
+        [textView hideMarkedTextField];
 }
 
 - (BOOL)windowShouldClose:(id)sender