diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 2bb31eaf71..32e96f399b 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -9,6 +9,7 @@
 #include <algorithm>
 #include <mutex>
 #include <thread>
+#include <unordered_set>
 
 #include <apps/launcher/utils/cellnameloader.hpp>
 
@@ -234,10 +235,12 @@ void Launcher::DataFilesPage::populateFileViews(const QString& contentModelName)
     for (auto& currentDir : directories)
         currentDir = QDir(QDir::cleanPath(currentDir)).canonicalPath();
 
-    // add directories, archives and content files
-    directories.removeDuplicates();
-    for (const auto& currentDir : directories)
+    std::unordered_set<QString> visitedDirectories;
+    for (const QString& currentDir : directories)
     {
+        if (!visitedDirectories.insert(currentDir).second)
+            continue;
+
         // add new achives files presents in current directory
         addArchivesFromDir(currentDir);