diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp
index e84ecfd90..6e5c3d283 100644
--- a/sdrgui/mainwindow.cpp
+++ b/sdrgui/mainwindow.cpp
@@ -269,6 +269,11 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse
 
     delete splash;
 
+    // Restore window size and position
+    QSettings s;
+    restoreGeometry(qUncompress(QByteArray::fromBase64(s.value("mainWindowGeometry").toByteArray())));
+    restoreState(qUncompress(QByteArray::fromBase64(s.value("mainWindowState").toByteArray())));
+
     qDebug() << "MainWindow::MainWindow: end";
 }
 
@@ -850,6 +855,11 @@ void MainWindow::closeEvent(QCloseEvent *closeEvent)
 {
     qDebug("MainWindow::closeEvent");
 
+    // Save window size and position
+    QSettings s;
+    s.setValue("mainWindowGeometry", qCompress(saveGeometry()).toBase64());
+    s.setValue("mainWindowState", qCompress(saveState()).toBase64());
+
     savePresetSettings(m_mainCore->m_settings.getWorkingPreset(), 0);
     saveFeatureSetPresetSettings(m_mainCore->m_settings.getWorkingFeatureSetPreset(), 0);
     m_mainCore->m_settings.save();