diff --git a/AppKit/CPPopover.j b/AppKit/CPPopover.j
index e382b1a58..a03885e80 100644
--- a/AppKit/CPPopover.j
+++ b/AppKit/CPPopover.j
@@ -150,7 +150,10 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 */
 - (void)setContentSize:(CGSize)aSize
 {
-    [_popoverWindow updateFrameWithSize:aSize];
+    if (!_popoverWindow)
+        [[_contentViewController view] setFrameSize:aSize];
+    else
+        [_popoverWindow updateFrameWithSize:aSize];
 }
 
 /*!