diff --git a/src/MacVim/MMFullScreenWindow.m b/src/MacVim/MMFullScreenWindow.m
index 666c14391c..2616414e08 100644
--- a/src/MacVim/MMFullScreenWindow.m
+++ b/src/MacVim/MMFullScreenWindow.m
@@ -165,7 +165,7 @@ - (void)enterFullScreen
     oldTabBarStyle = [[view tabBarControl] styleName];
 
     NSString *style =
-        shouldUseYosemiteTabBarStyle() ? @"Yosemite" : @"Unified";
+        shouldUseYosemiteTabBarStyle() ? (shouldUseMojaveTabBarStyle() ? @"Mojave" : @"Yosemite") : @"Unified";
     [[view tabBarControl] setStyleNamed:style];
 
     // add text view
diff --git a/src/MacVim/MMWindowController.m b/src/MacVim/MMWindowController.m
index d8578aefc5..ffeef33801 100644
--- a/src/MacVim/MMWindowController.m
+++ b/src/MacVim/MMWindowController.m
@@ -1751,12 +1751,12 @@ - (void)processAfterWindowPresentedQueue
 
 + (NSString *)tabBarStyleForUnified
 {
-    return shouldUseYosemiteTabBarStyle() ? @"Yosemite" : @"Unified";
+    return shouldUseYosemiteTabBarStyle() ? (shouldUseMojaveTabBarStyle() ? @"Mojave" : @"Yosemite") : @"Unified";
 }
 
 + (NSString *)tabBarStyleForMetal
 {
-    return shouldUseYosemiteTabBarStyle() ? @"Yosemite" : @"Metal";
+    return shouldUseYosemiteTabBarStyle() ? (shouldUseMojaveTabBarStyle() ? @"Mojave" : @"Yosemite") : @"Metal";
 }
 
 @end // MMWindowController (Private)