diff --git a/editor/export/project_export.cpp b/editor/export/project_export.cpp
index 0ba920f0109..81fc722adae 100644
--- a/editor/export/project_export.cpp
+++ b/editor/export/project_export.cpp
@@ -1623,10 +1623,18 @@ ProjectExportDialog::ProjectExportDialog() {
 	top_settings->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	panel->add_child(top_settings);
 
+	HBoxContainer *name_hbox = memnew(HBoxContainer);
+	Label *name_label = memnew(Label);
+	name_label->set_theme_type_variation("HeaderSmall");
+	name_label->set_text(TTR("Name:"));
+	name_hbox->add_child(name_label);
 	name = memnew(LineEdit);
-	top_settings->add_margin_child(TTR("Name:"), name);
+	name->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	name->connect(SceneStringName(text_submitted), callable_mp(this, &ProjectExportDialog::_name_changed));
 	name->connect(SceneStringName(focus_exited), callable_mp(this, &ProjectExportDialog::_name_editing_finished));
+	name_hbox->add_child(name);
+
+	top_settings->add_child(name_hbox);
 
 	runnable = memnew(CheckButton);
 	runnable->set_text(TTR("Runnable"));
@@ -1755,9 +1763,15 @@ ProjectExportDialog::ProjectExportDialog() {
 
 	// Patching.
 
+	ScrollContainer *patch_scroll_container = memnew(ScrollContainer);
+	patch_scroll_container->set_name(TTRC("Patching"));
+	patch_scroll_container->set_horizontal_scroll_mode(ScrollContainer::SCROLL_MODE_DISABLED);
+	sections->add_child(patch_scroll_container);
+
 	VBoxContainer *patch_vb = memnew(VBoxContainer);
-	sections->add_child(patch_vb);
-	patch_vb->set_name(TTRC("Patching"));
+	patch_vb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	patch_vb->set_v_size_flags(Control::SIZE_EXPAND_FILL);
+	patch_scroll_container->add_child(patch_vb);
 
 	patch_delta_encoding = memnew(CheckButton);
 	patch_delta_encoding->connect(SceneStringName(toggled), callable_mp(this, &ProjectExportDialog::_patch_delta_encoding_changed));