2 files changed, 30 insertions, 16 deletions

diff --git a/scene/gui/container.cpp b/scene/gui/container.cpp
index feaf516f42..83a4f34282 100644
--- a/scene/gui/container.cpp
+++ b/scene/gui/container.cpp
@@ -151,6 +151,18 @@ void Container::_notification(int p_what) {
 				queue_sort();
 			}
 		} break;
+		case NOTIFICATION_SORT_CHILDREN: {
+
+			Size2 s = get_size();
+
+			for (int i=0; i<get_child_count();i++) {
+				Control *c = get_child(i)->cast_to<Control>();
+				if (!c || !c->is_visible() || c->is_set_as_toplevel())
+					continue;
+
+				fit_child_in_rect(c,Rect2(0, 0, s.width, s.height));
+			}
+		}
 	}
 }
 
diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp
index 6b43425edc..f942f15ed0 100644
--- a/scene/gui/file_dialog.cpp
+++ b/scene/gui/file_dialog.cpp
@@ -186,15 +186,17 @@ void FileDialog::_action_pressed() {
 		hide();
 	}else if (mode==MODE_OPEN_ANY || mode==MODE_OPEN_DIR) {
 
-
 		String path=dir_access->get_current_dir();
-		/*if (tree->get_selected()) {
-			Dictionary d = tree->get_selected()->get_metadata(0);
+
+		path=path.replace("\\","/");
+
+		if (TreeItem* item = tree->get_selected()) {
+			Dictionary d = item->get_metadata(0);
 			if (d["dir"]) {
-				path=path+"/"+String(d["name"]);
+				path=path.plus_file(d["name"]);
 			}
-		}*/
-		path=path.replace("\\","/");
+		}
+
 		emit_signal("dir_selected",path);
 		hide();
 	}
@@ -348,18 +350,18 @@ void FileDialog::update_file_list() {
 	files.sort_custom<NoCaseComparator>();
 
 	while(!dirs.empty()) {
+		String& dir_name = dirs.front()->get();
+		TreeItem *ti=tree->create_item(root);
+		ti->set_text(0,dir_name+"/");
+		ti->set_icon(0,folder);
 
-		if (dirs.front()->get()!=".") {
-			TreeItem *ti=tree->create_item(root);
-			ti->set_text(0,dirs.front()->get()+"/");
-			ti->set_icon(0,folder);
-			Dictionary d;
-			d["name"]=dirs.front()->get();
-			d["dir"]=true;
-			ti->set_metadata(0,d);
-		}
-		dirs.pop_front();
+		Dictionary d;
+		d["name"]=dir_name;
+		d["dir"]=true;
+
+		ti->set_metadata(0,d);
 
+		dirs.pop_front();
 	}
 
 	dirs.clear();