diff --git a/src/Mod/Start/App/CustomFolderModel.cpp b/src/Mod/Start/App/CustomFolderModel.cpp
index bd7036e2e1..6225349039 100644
--- a/src/Mod/Start/App/CustomFolderModel.cpp
+++ b/src/Mod/Start/App/CustomFolderModel.cpp
@@ -41,6 +41,8 @@ CustomFolderModel::CustomFolderModel(QObject* parent)
 
     _customFolderDirectory =
         QDir(QString::fromStdString(parameterGroup->GetASCII("CustomFolder", "")));
+
+    _showOnlyFCStd = parameterGroup->GetBool("ShowOnlyFCStd", false);
 }
 
 void CustomFolderModel::loadCustomFolder()
@@ -52,6 +54,11 @@ void CustomFolderModel::loadCustomFolder()
             "BaseApp/Preferences/Mod/Start/CustomFolder: cannot read custom folder %s\n",
             _customFolderDirectory.absolutePath().toStdString().c_str());
     }
+
+    if (_showOnlyFCStd) {
+        _customFolderDirectory.setNameFilters(QStringList() << QStringLiteral("*.FCStd"));
+    }
+
     auto entries = _customFolderDirectory.entryList(QDir::Filter::Files | QDir::Filter::Readable,
                                                     QDir::SortFlag::Name);
     for (const auto& entry : entries) {
diff --git a/src/Mod/Start/App/CustomFolderModel.h b/src/Mod/Start/App/CustomFolderModel.h
index d4c132708d..3901e1e01d 100644
--- a/src/Mod/Start/App/CustomFolderModel.h
+++ b/src/Mod/Start/App/CustomFolderModel.h
@@ -46,6 +46,7 @@ public:
 
 private:
     QDir _customFolderDirectory;
+    bool _showOnlyFCStd;  // Show only FreeCAD files
 };
 
 }  // namespace Start