diff --git a/mozilla/widget/src/qt/nsWidget.cpp b/mozilla/widget/src/qt/nsWidget.cpp
index 2f363f6fcb6..6cdaae570ea 100644
--- a/mozilla/widget/src/qt/nsWidget.cpp
+++ b/mozilla/widget/src/qt/nsWidget.cpp
@@ -607,8 +607,12 @@ nsresult nsWidget::CreateWidget(nsIWidget *aParent,
 
   CreateNative(parentWidget);
   Resize(aRect.width,aRect.height,PR_FALSE);
-  qApp->processEvents(1);
-
+  if (mIsToplevel || IsDialog()) {
+    /* We have to Spin the Qt Event loop to make non-modal dialogs */
+    /* and top level windows come up with the correct size, but it */
+    /* creates problems for menus, etc.                            */
+    qApp->processEvents(1);
+  }
   DispatchStandardEvent(NS_CREATE);
   return NS_OK;
 }