diff --git a/src/fdosecrets/widgets/SettingsModels.cpp b/src/fdosecrets/widgets/SettingsModels.cpp
index 98f218477..e7b12b477 100644
--- a/src/fdosecrets/widgets/SettingsModels.cpp
+++ b/src/fdosecrets/widgets/SettingsModels.cpp
@@ -353,11 +353,9 @@ namespace FdoSecrets
 
     QVariant SettingsAliasesModel::dataForDatabase(const QUuid& publicUuid, int role) const
     {
-        switch (role) {
-        case Qt::EditRole: {
+        if (role == Qt::EditRole) {
             return publicUuid; // initial value for editor for this cell
         }
-        }
 
         auto dbWidget = m_databases->databaseWidgetFromPublicUuid(publicUuid);
         if (dbWidget) {
diff --git a/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.cpp b/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.cpp
index fbd09cfb0..7e6a8ad33 100644
--- a/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.cpp
+++ b/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.cpp
@@ -237,8 +237,9 @@ public:
             auto dbWidget = m_dbTabs->databaseWidgetFromIndex(i);
             auto db = dbWidget->database();
             if (!FdoSecrets::settings()->exposedGroup(db).isNull()) {
-                e->insertItem(i, dbWidget->displayName(), db->publicUuid());
-                e->setItemData(i, db->filePath(), Qt::ToolTipRole);
+                auto idx = e->count();
+                e->insertItem(idx, dbWidget->displayName(), db->publicUuid());
+                e->setItemData(idx, db->filePath(), Qt::ToolTipRole);
             }
         }
         return e;