diff --git a/AppKit/CPWindowController.j b/AppKit/CPWindowController.j
index aebbc5e89..a123238ab 100644
--- a/AppKit/CPWindowController.j
+++ b/AppKit/CPWindowController.j
@@ -72,11 +72,17 @@
 
     if (self)
     {
+        if (aWindow)
+            [self windowWillLoad];
+
         [self setWindow:aWindow];
         [self setShouldCloseDocument:NO];
 
         [self setNextResponder:CPApp];
 
+        if (aWindow)
+            [self windowDidLoad];
+
         _documents = [];
     }