diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp
index 136878e4705..3bb6345d734 100644
--- a/editor/editor_settings.cpp
+++ b/editor/editor_settings.cpp
@@ -729,6 +729,9 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	hints["docks/filesystem/display_mode"] = PropertyInfo(Variant::INT, "docks/filesystem/display_mode", PROPERTY_HINT_ENUM, "Thumbnails,List");
 	set("docks/filesystem/thumbnail_size", 64);
 	hints["docks/filesystem/thumbnail_size"] = PropertyInfo(Variant::INT, "docks/filesystem/thumbnail_size", PROPERTY_HINT_RANGE, "32,128,16");
+	set("docks/filesystem/display_mode", 0);
+	hints["docks/filesystem/display_mode"] = PropertyInfo(Variant::INT, "docks/filesystem/display_mode", PROPERTY_HINT_ENUM, "Thumbnails,List");
+	set("docks/filesystem/always_show_folders", true);
 
 	set("editors/animation/autorename_animation_tracks", true);
 	set("editors/animation/confirm_insert_track", true);
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
index 69c14244035..7b7cfd2289b 100644
--- a/editor/filesystem_dock.cpp
+++ b/editor/filesystem_dock.cpp
@@ -423,8 +423,10 @@ void FileSystemDock::_update_files(bool p_keep_selection) {
 	Ref<Texture> file_thumbnail;
 	Ref<Texture> file_thumbnail_broken;
 
+	bool always_show_folders = EditorSettings::get_singleton()->get("docks/filesystem/always_show_folders");
+
 	bool use_thumbnails = (display_mode == DISPLAY_THUMBNAILS);
-	bool use_folders = search_box->get_text().length() == 0 && split_mode;
+	bool use_folders = search_box->get_text().length() == 0 && (split_mode || always_show_folders);
 
 	if (use_thumbnails) { //thumbnails