diff --git a/src/MacVim/PSMTabBarControl/source/PSMYosemiteTabStyle.m b/src/MacVim/PSMTabBarControl/source/PSMYosemiteTabStyle.m
index f51cceed44..0997cc00bb 100644
--- a/src/MacVim/PSMTabBarControl/source/PSMYosemiteTabStyle.m
+++ b/src/MacVim/PSMTabBarControl/source/PSMYosemiteTabStyle.m
@@ -381,6 +381,7 @@ void YosemiteNSDrawWindowBackground(NSRect rect, NSColor *color)
         NSRect closeButtonRect = [cell closeButtonRectForFrame:cellFrame];
         NSImage *button = nil;
 
+        if ([cell isHighlighted]) button = closeButton;
         if ([cell closeButtonOver]) button = closeButtonOver;
         if ([cell closeButtonPressed]) button = closeButtonDown;