--- a/src/container.cpp
+++ b/src/container.cpp
@@ -803,7 +803,7 @@
         // for *every* resize and move event. Yay!
 
         if (windowState() != Qt::WindowMaximized)
-            The::settings().setContainerGeometry( saveGeometry() );
+            m_savedGeometry = saveGeometry();
     }
 
     return QMainWindow::event( e );
@@ -867,6 +867,7 @@
         if (m_sidebarEnabled)
             The::settings().setSplitterState( ui.splitter->saveState() );
 
+        The::settings().setContainerGeometry( m_savedGeometry );
         The::settings().setContainerWindowState( windowState() );
 
         The::settings().setVolume( ui_playcontrols.volume->value() );
--- a/src/container.h
+++ b/src/container.h
@@ -157,6 +157,8 @@
         
         bool m_closingDown;
         
+        QByteArray m_savedGeometry;
+
         QTimer* m_showRestStateTimer;
 
     private slots: