diff --git a/weboob/applications/qflatboob/main_window.py b/weboob/applications/qflatboob/main_window.py
index 59db6aaf..daa2d0d0 100644
--- a/weboob/applications/qflatboob/main_window.py
+++ b/weboob/applications/qflatboob/main_window.py
@@ -68,7 +68,7 @@ class MainWindow(QtMainWindow):
         for name in self.config.get('queries', default={}).iterkeys():
             self.ui.queriesList.addItem(name)
             if name == select_name:
-                self.ui.queriesList.setCurrentIndex(len(self.ui.queriesList))
+                self.ui.queriesList.setCurrentIndex(len(self.ui.queriesList)-1)
         self.connect(self.ui.queriesList, SIGNAL('currentIndexChanged(int)'), self.queryChanged)
 
     def addQuery(self):
@@ -101,6 +101,9 @@ class MainWindow(QtMainWindow):
         name = unicode(self.ui.queriesList.itemText(self.ui.queriesList.currentIndex()))
         q = self.config.get('queries', name)
 
+        if q is None:
+            return q
+
         self.ui.housingsList.clear()
         self.ui.queriesList.setEnabled(False)