diff --git a/editor/docks/filesystem_dock.cpp b/editor/docks/filesystem_dock.cpp
index f13caaec06..232fc2402c 100644
--- a/editor/docks/filesystem_dock.cpp
+++ b/editor/docks/filesystem_dock.cpp
@@ -561,6 +561,10 @@ void FileSystemDock::_update_display_mode(bool p_force) {
 				_update_file_list(!selected_files.is_empty(), selected_files);
 			} else {
 				tree->ensure_cursor_is_visible();
+
+				// Always update to avoid broken icons, as previous updates
+				// could have happened before the dock was inside the tree.
+				update_all();
 			}
 		} break;
 	}