diff --git a/src/ConfigDialog.cpp b/src/ConfigDialog.cpp
index 5cfe7bc11..41ad2317d 100644
--- a/src/ConfigDialog.cpp
+++ b/src/ConfigDialog.cpp
@@ -17,9 +17,9 @@ ConfigDialog::ConfigDialog(QDir _home, Zones *_zones, MainWindow *mainWindow) :
     setAttribute(Qt::WA_DeleteOnClose);
 
 #ifdef Q_OS_MAC
-    setUnifiedTitleAndToolBarOnMac(true);
     QToolBar *head = addToolBar("Preferences");
-    setFixedSize(525,600);
+    setFixedSize(525,540);
+    setUnifiedTitleAndToolBarOnMac(true);
 #else
     QToolBar *head = addToolBar("Options");
     head->setMovable(false); // oops!
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index c516bc733..ee85b224e 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -149,6 +149,13 @@ MainWindow::MainWindow(const QDir &home) :
 
     setAttribute(Qt::WA_DeleteOnClose);
 
+    // need to restore geometry before setUnifiedToolBar.. on Mac
+    appsettings->setValue(GC_SETTINGS_LAST, home.dirName());
+    QVariant geom = appsettings->value(this, GC_SETTINGS_MAIN_GEOM);
+    if (geom == QVariant()) resize(640, 480);
+    else setGeometry(geom.toRect());
+
+
 #ifdef Q_OS_MAC // MAC NATIVE TOOLBAR
     static CocoaInitializer cocoaInitializer; // we only need one
     setUnifiedTitleAndToolBarOnMac(true);
@@ -238,11 +245,6 @@ MainWindow::MainWindow(const QDir &home) :
     setContentsMargins(0,0,0,0);
     setAcceptDrops(true);
 
-    appsettings->setValue(GC_SETTINGS_LAST, home.dirName());
-    QVariant geom = appsettings->value(this, GC_SETTINGS_MAIN_GEOM);
-    if (geom == QVariant()) resize(640, 480);
-    else setGeometry(geom.toRect());
-
     GCColor *GCColorSet = new GCColor(this); // get/keep colorset
     GCColorSet->colorSet(); // shut up the compiler