diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 0157767a1..b98420fd1 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -85,6 +85,7 @@ MainWindow::MainWindow()
     // create actions for menus
     setupActions();
 
+
     // create view manager
     _viewManager = new ViewManager(this, actionCollection());
     connect(_viewManager , SIGNAL(empty()) , this , SLOT(close()));
@@ -131,6 +132,10 @@ MainWindow::MainWindow()
 
     // enable save and restore of window size
     setAutoSaveSettings("MainWindow", true);
+
+    // this must come at the end
+    applyAppSettings();
+    connect(AppSettings::self(), SIGNAL(configChanged()), this, SLOT(applyAppSettings()));
 }
 void MainWindow::removeMenuAccelerators()
 {
@@ -523,6 +528,11 @@ void MainWindow::showSettingsDialog()
     settingsDialog->show();
 }
 
+void MainWindow::applyAppSettings()
+{
+    // setAutoSaveSettings("MainWindow", AppSettings::saveGeometryOnExit());
+}
+
 void MainWindow::activateMenuBar()
 {
     const QList<QAction*> menuActions = menuBar()->actions();
diff --git a/src/MainWindow.h b/src/MainWindow.h
index b0523c332..2d036e07a 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -183,6 +183,8 @@ private slots:
 
     void openUrls(const QList<KUrl>& urls);
 
+    void applyAppSettings();
+
 private:
     void correctShortcuts();
     void removeMenuAccelerators();
diff --git a/src/settings/GeneralSettings.ui b/src/settings/GeneralSettings.ui
index d5b6c3827..613d8ab87 100644
--- a/src/settings/GeneralSettings.ui
+++ b/src/settings/GeneralSettings.ui
@@ -66,7 +66,7 @@
            </sizepolicy>
           </property>
           <property name="text">
-           <string>Save window size on exit</string>
+           <string>Save window size and position on exit</string>
           </property>
          </widget>
         </item>