diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index b62e5b587..4c73e9851 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -221,7 +221,15 @@ MainWindow::MainWindow(const QDir &home) :
         font.setPointSize(app.defaultFont);
         QApplication::setFont(font);
 
-    } else setGeometry(geom.toRect());
+    } else {
+        QRect size = desktop->availableGeometry();
+
+        // ensure saved geometry isn't greater than current screen size
+        if ((geom.toRect().height() > size.height()) || (geom.toRect().width() > size.width()))
+            setGeometry(size);
+        else
+            setGeometry(geom.toRect());
+    }
 
 
 #ifdef Q_OS_MAC // MAC NATIVE TOOLBAR