diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index f6996f92a48..40868f88a0b 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -229,9 +229,7 @@ MainWindow::MainWindow() :
     setAcceptDrops(true);
 
     m_autoSaveSessionTimer = new QTimer(this);
-    m_autoSaveSessionTimer->setSingleShot(true);
     m_autoSaveSessionTimer->setInterval(10000);
-    m_autoSaveSessionTimer->start();
     connect(m_autoSaveSessionTimer, SIGNAL(timeout()),
             m_coreImpl, SIGNAL(saveSettingsRequested()));
 }
@@ -375,6 +373,7 @@ void MainWindow::extensionsInitialized()
     emit m_coreImpl->coreAboutToOpen();
     show();
     emit m_coreImpl->coreOpened();
+    m_autoSaveSessionTimer->start();
 }
 
 void MainWindow::closeEvent(QCloseEvent *event)