diff --git a/aegisub/src/preferences.cpp b/aegisub/src/preferences.cpp
index 94490027d..4e29b5498 100644
--- a/aegisub/src/preferences.cpp
+++ b/aegisub/src/preferences.cpp
@@ -102,19 +102,19 @@ public:
 /// General preferences page
 General::General(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("General")) {
 
-	wxFlexGridSizer *startup = PageSizer(_("Startup"));
-	OptionAdd(startup, _("Check for updates"), "App/Auto/Check For Updates");
+	wxFlexGridSizer *general = PageSizer(_("General"));
+	OptionAdd(general, _("Check for updates on startup"), "App/Auto/Check For Updates");
+	CellSkip(general);
+
+	wxString autoload_modes[] = { _("Never"), _("Always"), _("Ask") };
+	wxArrayString autoload_modes_arr(3, autoload_modes);
+	OptionChoice(general, _("Automatically load linked files"), autoload_modes_arr, "App/Auto/Load Linked Files");
+	OptionAdd(general, _("Toolbar Icon Size"), "App/Toolbar Icon Size");
+	OptionAdd(general, _("Undo Levels"), "Limits/Undo Levels");
 
 	wxFlexGridSizer *recent = PageSizer(_("Recently Used Lists"));
 	OptionAdd(recent, _("Files"), "Limits/MRU");
 	OptionAdd(recent, _("Find/Replace"), "Limits/Find Replace");
-	sizer->AddSpacer(15);
-
-	wxFlexGridSizer *undo = PageSizer(_("Undo / Redo Settings"));
-	OptionAdd(undo, _("Undo Levels"), "Limits/Undo Levels");
-
-	wxFlexGridSizer *toolbar = PageSizer(_("Toolbar Settings"));
-	OptionAdd(toolbar, _("Toolbar Icon Size"), "App/Toolbar Icon Size");
 
 	SetSizerAndFit(sizer);
 }