diff --git a/gpt4all-chat/main.qml b/gpt4all-chat/main.qml
index 83b7d7c7..2029e5b6 100644
--- a/gpt4all-chat/main.qml
+++ b/gpt4all-chat/main.qml
@@ -214,11 +214,13 @@ Window {
                     anchors.horizontalCenter: parent.horizontalCenter
                     leftPadding: 10
                     rightPadding: 20
-                    text: ModelList.installedModels.count
+                    text: (ModelList.installedModels.count > 0
                         ? currentChat.modelLoadingError !== "" ? qsTr("Model loading error...")
-                        : (comboBox.textAt(comboBox.currentIndex) !== "" ? comboBox.textAt(comboBox.currentIndex)
-                        : comboBox.valueAt(comboBox.currentIndex))
-                        : ""
+                        : (comboBox.textAt(comboBox.currentIndex) !== ""
+                        ? comboBox.textAt(comboBox.currentIndex)
+                        : (comboBox.valueAt(comboBox.currentIndex) !== "undefined" ? ""
+                        : comboBox.valueAt(comboBox.currentIndex)))
+                        : "")
                     font: comboBox.font
                     color: theme.textColor
                     verticalAlignment: Text.AlignVCenter
diff --git a/gpt4all-chat/modellist.cpp b/gpt4all-chat/modellist.cpp
index c806686d..4c4b7e78 100644
--- a/gpt4all-chat/modellist.cpp
+++ b/gpt4all-chat/modellist.cpp
@@ -458,51 +458,37 @@ void ModelList::updateModelsFromDirectory()
 {
     const QString exePath = QCoreApplication::applicationDirPath() + QDir::separator();
     const QString localPath = localModelsPath();
-    {
-        QDir dir(exePath);
-        QStringList allFiles = dir.entryList(QDir::Files);
 
-        // All files that end with .bin and have 'ggml' somewhere in the name
-        QStringList fileNames;
-        for(const QString& filename : allFiles) {
-            if (filename.endsWith(".bin") && filename.contains("ggml") && !filename.startsWith("incomplete")) {
-                fileNames.append(filename);
+    auto processDirectory = [&](const QString& path) {
+        QDirIterator it(path, QDirIterator::Subdirectories);
+        while (it.hasNext()) {
+            it.next();
+
+            if (!it.fileInfo().isDir()) {
+                QString filename = it.fileName();
+
+                // All files that end with .bin and have 'ggml' somewhere in the name
+                if ((filename.endsWith(".bin") && filename.contains("ggml") && !filename.startsWith("incomplete"))
+                    || (filename.endsWith(".txt") && filename.startsWith("chatgpt-"))) {
+
+                    QString filePath = it.filePath();
+                    QFileInfo info(filePath);
+
+                    if (!info.exists())
+                        continue;
+
+                    if (!contains(filename))
+                        addModel(filename);
+
+                    updateData(filename, ChatGPTRole, filename.startsWith("chatgpt-"));
+                    updateData(filename, DirpathRole, path);
+                    updateData(filename, FilesizeRole, toFileSize(info.size()));
+                }
             }
         }
+    };
 
-        for (const QString& f : fileNames) {
-            QString filePath = exePath + f;
-            QFileInfo info(filePath);
-            if (!info.exists())
-                continue;
-            if (!contains(f))
-                addModel(f);
-            updateData(f, DirpathRole, exePath);
-            updateData(f, FilesizeRole, toFileSize(info.size()));
-        }
-    }
-
-    if (localPath != exePath) {
-        QDir dir(localPath);
-        QStringList allFiles = dir.entryList(QDir::Files);
-        QStringList fileNames;
-        for(const QString& filename : allFiles) {
-            if ((filename.endsWith(".bin") && filename.contains("ggml") && !filename.startsWith("incomplete"))
-                || (filename.endsWith(".txt") && filename.startsWith("chatgpt-"))) {
-                fileNames.append(filename);
-            }
-        }
-
-        for (const QString& f : fileNames) {
-            QString filePath = localPath + f;
-            QFileInfo info(filePath);
-            if (!info.exists())
-                continue;
-            if (!contains(f))
-                addModel(f);
-            updateData(f, ChatGPTRole, f.startsWith("chatgpt-"));
-            updateData(f, DirpathRole, localPath);
-            updateData(f, FilesizeRole, toFileSize(info.size()));
-        }
-    }
+    processDirectory(exePath);
+    if (localPath != exePath)
+        processDirectory(localPath);
 }