diff --git a/AppKit/Cib/_CPCibWindowTemplate.j b/AppKit/Cib/_CPCibWindowTemplate.j
index 869469626..551521278 100644
--- a/AppKit/Cib/_CPCibWindowTemplate.j
+++ b/AppKit/Cib/_CPCibWindowTemplate.j
@@ -103,13 +103,15 @@
     //[result setHidesOnDeactivate:(_wtFlags&0x80000000)?YES:NO];
     [theWindow setTitle:_windowTitle];
 
-    // FIXME: we can't autoresize yet...
+    var contentViewAutoresizesSubviews = [_windowView autoresizesSubviews];
+
     [_windowView setAutoresizesSubviews:NO];
-
     [theWindow setContentView:_windowView];
-
     [_windowView setAutoresizesSubviews:YES];
 
+    [[theWindow contentView] setAutoresizesSubviews:contentViewAutoresizesSubviews];
+
+
     if ([_viewClass isKindOfClass:[CPToolbar class]])
        [theWindow setToolbar:_viewClass];