diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16174087a9..79f7695667 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -187,6 +187,7 @@
     Bug #8048: Actors can generate negative collision extents and have no collision
     Bug #8063: menu_background.bik video with audio freezes the game forever
     Bug #8064: Lua move360 script doesn't respect the enableZoom/disableZoom Camera interface setting
+    Bug #8085: Don't search in scripts or shaders directories for "Select directories you wish to add" menu in launcher
     Feature #1415: Infinite fall failsafe
     Feature #2566: Handle NAM9 records for manual cell references
     Feature #3537: Shader-based water ripples
diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 797aa530b0..35e743e13f 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -75,7 +75,10 @@ namespace
         QDir currentDir(path);
         if (!currentDir.entryInfoList(fileFilter, QDir::Files).empty()
             || !currentDir.entryInfoList(dirFilter, QDir::Dirs | QDir::NoDotAndDotDot).empty())
+        {
             dirs.push_back(currentDir.canonicalPath());
+            return;
+        }
 
         for (const auto& subdir : currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot))
             contentSubdirs(subdir.canonicalFilePath(), dirs);