1 files changed, 13 insertions, 12 deletions

diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
index 69c1424403..f0ace864e4 100644
--- a/editor/filesystem_dock.cpp
+++ b/editor/filesystem_dock.cpp
@@ -143,11 +143,7 @@ void FileSystemDock::_notification(int p_what) {
 			//button_instance->set_icon( get_icon("Add","EditorIcons"));
 			//button_open->set_icon( get_icon("Folder","EditorIcons"));
 			button_back->set_icon(get_icon("Filesystem", "EditorIcons"));
-			if (display_mode == DISPLAY_THUMBNAILS) {
-				button_display_mode->set_icon(get_icon("FileList", "EditorIcons"));
-			} else {
-				button_display_mode->set_icon(get_icon("FileThumbnail", "EditorIcons"));
-			}
+			_update_file_display_toggle_button();
 			button_display_mode->connect("pressed", this, "_change_file_display");
 			//file_options->set_icon( get_icon("Tools","EditorIcons"));
 			files->connect("item_activated", this, "_select_file");
@@ -204,11 +200,7 @@ void FileSystemDock::_notification(int p_what) {
 			button_reload->set_icon(get_icon("Reload", "EditorIcons"));
 			button_favorite->set_icon(get_icon("Favorites", "EditorIcons"));
 			button_back->set_icon(get_icon("Filesystem", "EditorIcons"));
-			if (display_mode == DISPLAY_THUMBNAILS) {
-				button_display_mode->set_icon(get_icon("FileList", "EditorIcons"));
-			} else {
-				button_display_mode->set_icon(get_icon("FileThumbnail", "EditorIcons"));
-			}
+			_update_file_display_toggle_button();
 
 			search_box->add_icon_override("right_icon", get_icon("Search", "EditorIcons"));
 
@@ -351,15 +343,22 @@ void FileSystemDock::_thumbnail_done(const String &p_path, const Ref<Texture> &p
 	}
 }
 
-void FileSystemDock::_change_file_display() {
+void FileSystemDock::_update_file_display_toggle_button() {
 
 	if (button_display_mode->is_pressed()) {
 		display_mode = DISPLAY_LIST;
 		button_display_mode->set_icon(get_icon("FileThumbnail", "EditorIcons"));
+		button_display_mode->set_tooltip(TTR("View items as a grid of thumbnails"));
 	} else {
 		display_mode = DISPLAY_THUMBNAILS;
 		button_display_mode->set_icon(get_icon("FileList", "EditorIcons"));
+		button_display_mode->set_tooltip(TTR("View items as a list"));
 	}
+}
+
+void FileSystemDock::_change_file_display() {
+
+	_update_file_display_toggle_button();
 
 	EditorSettings::get_singleton()->set("docks/filesystem/display_mode", display_mode);
 
@@ -423,8 +422,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