diff --git a/src/frontend/bookshelfmanager/installpage/btinstallpage.cpp b/src/frontend/bookshelfmanager/installpage/btinstallpage.cpp
index b8847da..8537308 100644
--- a/src/frontend/bookshelfmanager/installpage/btinstallpage.cpp
+++ b/src/frontend/bookshelfmanager/installpage/btinstallpage.cpp
@@ -405,7 +405,11 @@ void BtInstallPage::slotSourceDelete() {
 }

 void BtInstallPage::slotSourceIndexChanged(int index) {
-    if (index < 0) index = 0;
+    if (index < 0) {
+        if(!m_sourceComboBox->count())
+            return;
+        index = 0;
+    }

     /// \todo use pointers instead of text
     QString moduleName = m_sourceComboBox->itemText(index);
@@ -431,9 +435,10 @@ void BtInstallPage::slotSelectedModulesChanged() {
 void BtInstallPage::slotSwordSetupChanged() {
     QString moduleName = m_sourceComboBox->currentText();

-    initSourcesCombo();
+    // clean m_sourceMap before initSourcesCombo() made too much work
     qDeleteAll(m_sourceMap.values());
     m_sourceMap.clear();
+    initSourcesCombo();
     m_sourceComboBox->setCurrentIndex(m_sourceComboBox->findText(moduleName));
     initPathCombo();
     m_modulesSelected = 0;