diff --git a/unix/dialog.c b/unix/dialog.c
index 7e9051be..5846466a 100644
--- a/unix/dialog.c
+++ b/unix/dialog.c
@@ -2143,7 +2143,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...");