diff --git a/Buildscr b/Buildscr
index d2b1c81b..02de6432 100644
--- a/Buildscr
+++ b/Buildscr
@@ -35,7 +35,7 @@ module putty
 ifeq "$(RELEASE)" "" set Ndate $(!builddate)
 ifneq "$(Ndate)" "" in . do echo $(Ndate) | perl -pe 's/(....)(..)(..)/$$1-$$2-$$3/' > date
 ifneq "$(Ndate)" "" read Date date
-set Epoch 18288 # update this at every release
+set Epoch 18293 # update this at every release
 ifneq "$(Ndate)" "" in . do echo $(Ndate) | perl -ne 'use Time::Local; /(....)(..)(..)/ and print timegm(0,0,0,$$3,$$2-1,$$1) / 86400 - $(Epoch)' > days
 ifneq "$(Ndate)" "" read Days days
 
diff --git a/unix/dialog.c b/unix/dialog.c
index 1e45458a..95a08f86 100644
--- a/unix/dialog.c
+++ b/unix/dialog.c
@@ -2141,7 +2141,10 @@ GtkWidget *layout_ctrls(
           case CTRL_FONTSELECT: {
             GtkWidget *ww;
 
-            if (!ctrl->fileselect.just_button) {
+            bool just_button = (ctrl->type == CTRL_FILESELECT &&
+                                ctrl->fileselect.just_button);
+
+            if (!just_button) {
                 const char *browsebtn =
                     (ctrl->type == CTRL_FILESELECT ?
                      "Browse..." : "Change...");