4 files changed, 21 insertions, 7 deletions

diff --git a/src/app.c b/src/app.c
index ac93d511..eb48d13f 100644
--- a/src/app.c
+++ b/src/app.c
@@ -168,6 +168,7 @@ static iString *serializePrefs_App_(const iApp *d) {
     }
     appendFormat_String(str, "sidebar.mode arg:%d\n", mode_SidebarWidget(sidebar));
     appendFormat_String(str, "uiscale arg:%f\n", uiScale_Window(d->window));
+    appendFormat_String(str, "prefs.dialogtab arg:%d\n", d->prefs.dialogTab);
     appendFormat_String(str, "font.set arg:%d\n", d->prefs.font);
     appendFormat_String(str, "headingfont.set arg:%d\n", d->prefs.headingFont);
     appendFormat_String(str, "zoom.set arg:%d\n", d->prefs.zoomPercent);
@@ -695,6 +696,9 @@ static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
                          cstr_String(text_InputWidget(findChild_Widget(d, "prefs.proxy.http"))));
         postCommandf_App("proxy.gopher address:%s",
                          cstr_String(text_InputWidget(findChild_Widget(d, "prefs.proxy.gopher"))));
+        const iWidget *tabs = findChild_Widget(d, "prefs.tabs");
+        postCommandf_App("prefs.dialogtab arg:%u",
+                         tabPageIndex_Widget(tabs, currentTabPage_Widget(tabs)));
         destroy_Widget(d);
         return iTrue;
     }
@@ -819,7 +823,11 @@ static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
 
 iBool handleCommand_App(const char *cmd) {
     iApp *d = &app_;
-    if (equal_Command(cmd, "window.retain")) {
+    if (equal_Command(cmd, "prefs.dialogtab")) {
+        d->prefs.dialogTab = arg_Command(cmd);
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "window.retain")) {
         d->prefs.retainWindowSize = arg_Command(cmd);
         return iTrue;
     }
@@ -842,7 +850,7 @@ iBool handleCommand_App(const char *cmd) {
         postCommand_App("font.changed");
         postCommand_App("window.unfreeze");
         return iTrue;
-    }
+    }    
     else if (equal_Command(cmd, "zoom.set")) {
         setFreezeDraw_Window(get_Window(), iTrue); /* no intermediate draws before docs updated */
         d->prefs.zoomPercent = arg_Command(cmd);
@@ -1043,6 +1051,8 @@ iBool handleCommand_App(const char *cmd) {
                             schemeProxy_App(range_CStr("http")));
         setText_InputWidget(findChild_Widget(dlg, "prefs.proxy.gopher"),
                             schemeProxy_App(range_CStr("gopher")));
+        iWidget *tabs = findChild_Widget(dlg, "prefs.tabs");
+        showTabPage_Widget(tabs, tabPage_Widget(tabs, d->prefs.dialogTab));
         setCommandHandler_Widget(dlg, handlePrefsCommands_);
     }
     else if (equal_Command(cmd, "navigate.home")) {
diff --git a/src/prefs.c b/src/prefs.c
index a36be6a0..146f3838 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -1,6 +1,7 @@
 #include "prefs.h"
 
 void init_Prefs(iPrefs *d) {
+    d->dialogTab         = 0;
     d->theme             = dark_ColorTheme;
     d->useSystemTheme    = iTrue;
     d->retainWindowSize  = iTrue;
diff --git a/src/prefs.h b/src/prefs.h
index 53f5dfd7..a19cc0ca 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -10,6 +10,7 @@
 iDeclareType(Prefs)
 
 struct Impl_Prefs {
+    int dialogTab;
     iBool retainWindowSize;
     float uiScale;    
     int zoomPercent;
diff --git a/src/ui/util.c b/src/ui/util.c
index 67d34062..c99df1fd 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -904,6 +904,7 @@ iWidget *makePreferences_Widget(void) {
                          iClob(new_LabelWidget(uiHeading_ColorEscape "PREFERENCES", 0, 0, NULL)),
                          frameless_WidgetFlag);
     iWidget *tabs = makeTabs_Widget(dlg);
+    setId_Widget(tabs, "prefs.tabs");
     iWidget *headings, *values;
     /* General preferences. */ {
         appendTwoColumnPage_(tabs, "General", '1', &headings, &values);
@@ -933,14 +934,15 @@ iWidget *makePreferences_Widget(void) {
     /* Layout. */ {
         appendTwoColumnPage_(tabs, "Style", '2', &headings, &values);
         /* Fonts. */ {
-            addChild_Widget(headings, iClob(makeHeading_Widget("Body font:")));
-            iWidget *fonts = new_Widget();
-            addFontButtons_(fonts, "font");
-            addChildFlags_Widget(values, iClob(fonts), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
+            iWidget *fonts;
             addChild_Widget(headings, iClob(makeHeading_Widget("Heading font:")));
             fonts = new_Widget();
             addFontButtons_(fonts, "headingfont");
             addChildFlags_Widget(values, iClob(fonts), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
+            addChild_Widget(headings, iClob(makeHeading_Widget("Body font:")));
+            fonts = new_Widget();
+            addFontButtons_(fonts, "font");
+            addChildFlags_Widget(values, iClob(fonts), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
         }
         addChild_Widget(headings, iClob(makePadding_Widget(2 * gap_UI)));
         addChild_Widget(values, iClob(makePadding_Widget(2 * gap_UI)));
@@ -999,7 +1001,7 @@ iWidget *makePreferences_Widget(void) {
     addAction_Widget(dlg, prevTab_KeyShortcut, "tabs.prev");
     addAction_Widget(dlg, nextTab_KeyShortcut, "tabs.next");
     addChild_Widget(get_Window()->root, iClob(dlg));
-    centerSheet_Widget(dlg);
+    centerSheet_Widget(dlg);    
     return dlg;
 }