diff --git a/AppKit/CPWindow/CPWindow.j b/AppKit/CPWindow/CPWindow.j
index 6991f5781..7e46c28e0 100644
--- a/AppKit/CPWindow/CPWindow.j
+++ b/AppKit/CPWindow/CPWindow.j
@@ -1779,6 +1779,8 @@ CPTexturedBackgroundWindowMask
 
     [self _setupFirstResponder:nil];
 
+    [_windowView noteKeyWindowStateChanged];
+
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPWindowDidBecomeKeyNotification
                       object:self];
@@ -1836,6 +1838,8 @@ CPTexturedBackgroundWindowMask
     if (CPApp._keyWindow === self)
         CPApp._keyWindow = nil;
 
+    [_windowView noteKeyWindowStateChanged];
+
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPWindowDidResignKeyNotification
                       object:self];
@@ -2181,6 +2185,8 @@ CPTexturedBackgroundWindowMask
     [self _synchronizeMenuBarTitleWithWindowTitle];
     [self _synchronizeSaveMenuWithDocumentSaving];
 
+    [_windowView noteMainWindowStateChanged];
+
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPWindowDidBecomeMainNotification
                       object:self];
@@ -2197,6 +2203,8 @@ CPTexturedBackgroundWindowMask
 
     if (CPApp._mainWindow === self)
         CPApp._mainWindow = nil;
+
+    [_windowView noteMainWindowStateChanged];
 }
 
 - (void)_updateMainAndKeyWindows