1 files changed, 30 insertions, 8 deletions

diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
index 46f89439c0..4794d4d8a0 100644
--- a/editor/filesystem_dock.cpp
+++ b/editor/filesystem_dock.cpp
@@ -395,6 +395,9 @@ void FileSystemDock::_notification(int p_what) {
 }
 
 void FileSystemDock::_tree_multi_selected(Object *p_item, int p_column, bool p_selected) {
+	// Update the import dock
+	import_dock_needs_update = true;
+	call_deferred("_update_import_dock");
 
 	// Return if we don't select something new
 	if (!p_selected)
@@ -1535,7 +1538,7 @@ void FileSystemDock::_file_option(int p_option, const Vector<String> p_selected)
 			if (!fpath.ends_with("/")) {
 				fpath = fpath.get_base_dir();
 			}
-			make_script_dialog_text->config("Node", fpath + "new_script.gd");
+			make_script_dialog_text->config("Node", fpath + "new_script.gd", false);
 			make_script_dialog_text->popup_centered(Size2(300, 300) * EDSCALE);
 		} break;
 
@@ -1856,7 +1859,7 @@ void FileSystemDock::_get_drag_target_folder(String &target, bool &target_favori
 		}
 
 		String ltarget = files->get_item_metadata(pos);
-		target = ltarget.ends_with("/") ? target : path;
+		target = ltarget.ends_with("/") ? ltarget : path;
 		return;
 	}
 
@@ -2122,15 +2125,33 @@ void FileSystemDock::_update_import_dock() {
 	if (!import_dock_needs_update)
 		return;
 
-	//check import
+	// List selected
+	Vector<String> selected;
+	if (display_mode_setting == DISPLAY_MODE_SETTING_TREE_ONLY) {
+		// Use the tree
+		selected = _tree_get_selected();
+
+	} else {
+		// Use the file list
+		for (int i = 0; i < files->get_item_count(); i++) {
+			if (!files->is_selected(i))
+				continue;
+
+			selected.push_back(files->get_item_metadata(i));
+		}
+	}
+
+	// Check import
 	Vector<String> imports;
 	String import_type;
+	for (int i = 0; i < selected.size(); i++) {
+		String fpath = selected[i];
 
-	for (int i = 0; i < files->get_item_count(); i++) {
-		if (!files->is_selected(i))
-			continue;
+		if (fpath.ends_with("/")) {
+			imports.clear();
+			break;
+		}
 
-		String fpath = files->get_item_metadata(i);
 		if (!FileAccess::exists(fpath + ".import")) {
 			imports.clear();
 			break;
@@ -2317,7 +2338,7 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) {
 	tree->set_drag_forwarding(this);
 	tree->set_allow_rmb_select(true);
 	tree->set_select_mode(Tree::SELECT_MULTI);
-	tree->set_custom_minimum_size(Size2(0, 200 * EDSCALE));
+	tree->set_custom_minimum_size(Size2(0, 15 * EDSCALE));
 	split_box->add_child(tree);
 
 	tree->connect("item_edited", this, "_favorite_toggled");
@@ -2356,6 +2377,7 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) {
 	files->connect("gui_input", this, "_file_list_gui_input");
 	files->connect("multi_selected", this, "_file_multi_selected");
 	files->connect("rmb_clicked", this, "_file_list_rmb_pressed");
+	files->set_custom_minimum_size(Size2(0, 15 * EDSCALE));
 	files->set_allow_rmb_select(true);
 	file_list_vb->add_child(files);