diff --git a/Changelog b/Changelog
index df1ba89bb..b5882ca6f 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,8 @@
 * Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.5.3
     - BUGFIX: Fix priority up/down for multiple torrents at the same time (closes #692184)
     - BUGFIX: Make sure the number of torrents is properly set on startup (closes #694135)
+    - BUGFIX: Fix scan directories saving (closes #694768)
+    - BUGFIX: Make sure the main window has focus on startup
 
 * Sun Dec 19 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.5.2
     - BUGFIX: Fix alternative speed icon staying pressed when disabled
diff --git a/src/main.cpp b/src/main.cpp
index a9a31ad48..353b69ddf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -296,6 +296,8 @@ int main(int argc, char *argv[]){
   torrentCmdLine.removeFirst();
 #ifndef DISABLE_GUI
   MainWindow window(0, torrentCmdLine);
+  if(!no_splash)
+    QObject::connect(splash, SIGNAL(destroyed()), &window, SLOT(raise()));
   QObject::connect(&app, SIGNAL(messageReceived(const QString&)),
                    &window, SLOT(processParams(const QString&)));
   app.setActivationWindow(&window);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a92f12641..3b472ef94 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -225,6 +225,8 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
   } else {
     if(pref.startMinimized())
       showMinimized();
+    else
+      setFocus();
   }
 
   // Start watching the executable for updates
diff --git a/src/preferences/options_imp.cpp b/src/preferences/options_imp.cpp
index abf591f36..34f42796d 100644
--- a/src/preferences/options_imp.cpp
+++ b/src/preferences/options_imp.cpp
@@ -341,7 +341,7 @@ void options_imp::saveOptions(){
   pref.preAllocateAllFiles(preAllocateAllFiles());
   pref.useAdditionDialog(useAdditionDialog());
   pref.addTorrentsInPause(addTorrentsInPause());
-  ScanFoldersModel::instance()->makePersistent(pref);
+  ScanFoldersModel::instance()->makePersistent();
   addedScanDirs.clear();
   QString export_dir = getExportDir();
 #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
diff --git a/src/qtlibtorrent/qbtsession.cpp b/src/qtlibtorrent/qbtsession.cpp
index 671c2ac17..30f657ee3 100644
--- a/src/qtlibtorrent/qbtsession.cpp
+++ b/src/qtlibtorrent/qbtsession.cpp
@@ -276,7 +276,8 @@ void QBtSession::configureSession() {
   }
   int i = 0;
   foreach (const QString &dir, scan_dirs) {
-    m_scanFolders->addPath(dir, downloadInDirList.at(i));
+    qDebug() << "Adding scan dir" << dir << downloadInDirList.at(i);
+    ScanFoldersModel::PathStatus ret = m_scanFolders->addPath(dir, downloadInDirList.at(i));
     ++i;
   }
   // * Export Dir
diff --git a/src/scannedfoldersmodel.cpp b/src/scannedfoldersmodel.cpp
index 466d28957..52c3d4dc8 100644
--- a/src/scannedfoldersmodel.cpp
+++ b/src/scannedfoldersmodel.cpp
@@ -29,7 +29,7 @@
  */
 
 #include "scannedfoldersmodel.h"
-
+#include "preferences.h"
 #include "filesystemwatcher.h"
 
 #include <QDir>
@@ -189,15 +189,16 @@ int ScanFoldersModel::findPathData(const QString &path) const {
   return -1;
 }
 
-void ScanFoldersModel::makePersistent(QIniSettings &settings) {
+void ScanFoldersModel::makePersistent() {
+  Preferences pref;
   QStringList paths;
   QList<bool> downloadInFolderInfo;
   foreach (const PathData* pathData, m_pathList) {
     paths << pathData->path;
     downloadInFolderInfo << pathData->downloadAtPath;
   }
-  settings.setValue(QString::fromUtf8("ScanDirs"), paths);
-  settings.setValue(QString::fromUtf8("DownloadInScanDirs"), misc::toStringList(downloadInFolderInfo));
+  pref.setScanDirs(paths);
+  pref.setDownloadInScanDirs(downloadInFolderInfo);
 }
 
 ScanFoldersModel *ScanFoldersModel::m_instance = 0;
diff --git a/src/scannedfoldersmodel.h b/src/scannedfoldersmodel.h
index 35da569a5..f0551d3e6 100644
--- a/src/scannedfoldersmodel.h
+++ b/src/scannedfoldersmodel.h
@@ -61,7 +61,7 @@ public:
   PathStatus setDownloadAtPath(int row, bool downloadAtPath);
 
   bool downloadInTorrentFolder(const QString &filePath) const;
-  void makePersistent(QIniSettings &settings);
+  void makePersistent();
 
 signals:
   // The absolute paths of new torrent files in the scanned directories.