diff --git a/TODO b/TODO
index 00c0fd2b2..040c128f9 100644
--- a/TODO
+++ b/TODO
@@ -53,8 +53,7 @@
 * beta 7
   - update doc for plugins (and add screenies)
   - update doc for options
-	- See bug about negative ETA
-	- Fix search engines saving
+  - See bug about negative ETA
   - Translations update (IN PROGRESS)
   - Wait that http://pastebin.ca/690649 is fixed
 
diff --git a/src/engineSelectDlg.cpp b/src/engineSelectDlg.cpp
index 6ca06764b..465ed8878 100644
--- a/src/engineSelectDlg.cpp
+++ b/src/engineSelectDlg.cpp
@@ -68,6 +68,7 @@ engineSelectDlg::engineSelectDlg(QWidget *parent) : QDialog(parent) {
 
 engineSelectDlg::~engineSelectDlg() {
   qDebug("Destroying engineSelectDlg");
+  saveSettings();
   emit enginesChanged();
   qDebug("Before deleting downloader");
   delete downloader;
@@ -110,12 +111,14 @@ void engineSelectDlg::dragEnterEvent(QDragEnterEvent *event) {
 }
 
 void engineSelectDlg::saveSettings() {
+  qDebug("Saving engines settings");
   QStringList known_engines;
   QVariantList known_enginesEnabled;
   QString engine;
-  foreach(engine, installed_engines) {
+  foreach(engine, installed_engines.keys()) {
     known_engines << engine;
     known_enginesEnabled << QVariant(installed_engines.value(engine, true));
+    qDebug("Engine %s has state: %d", engine.toUtf8().data(), installed_engines.value(engine, true));
   }
   QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
   settings.setValue(QString::fromUtf8("SearchEngines/knownEngines"), known_engines);