diff --git a/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/properties/FontButton.java b/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/properties/FontButton.java
index d1c76f57fe..bb39e9d402 100644
--- a/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/properties/FontButton.java
+++ b/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/properties/FontButton.java
@@ -43,23 +43,20 @@ public class FontButton extends Button
     private final ComboBox<String> size = new ComboBox<>(FXCollections.observableArrayList("8", "10", "12", "14", "16", "18", "22", "24", "32"));
     private final CheckBox bold = new CheckBox(Messages.FontBtnBold),
                            italic = new CheckBox(Messages.FontBtnItalics);
-    private TextField example = new TextField(Messages.FontBtnExample);
+    private final TextField example = new TextField(Messages.FontBtnExample);
 
-    private PopOver popover;
+    private final PopOver popover;
 
     private Font font;
     private Consumer<Font> on_font_selected;
 
-    public FontButton(){
-    }
-
-    /** @param initial_font Intiial font
-     *  @param on_font_selected Callback for selected font
+    /**
+     * No-arg constructor needed by FXML.
+     * <p>
+     *     Initial font and on_font_selected callback must be set if this constructor is used.
+     * </p>
      */
-    public FontButton(final Font initial_font, final Consumer<Font> on_font_selected)
-    {
-        this.font = initial_font;
-        this.on_font_selected = on_font_selected;
+    public FontButton(){
         popover = new PopOver(createContent());
         setOnAction(event ->
         {
@@ -70,6 +67,16 @@ public FontButton(final Font initial_font, final Consumer<Font> on_font_selected
         });
     }
 
+    /** @param initial_font Initial font
+     *  @param on_font_selected Callback for selected font
+     */
+    public FontButton(final Font initial_font, final Consumer<Font> on_font_selected)
+    {
+        this();
+        this.font = initial_font;
+        this.on_font_selected = on_font_selected;
+    }
+
     private Node createContent()
     {
         // Name:  combo
@@ -171,4 +178,12 @@ private String getDescription(final Font font)
             buf.append(",").append(font.getStyle());
         return buf.toString();
     }
-}
\ No newline at end of file
+
+    public void setOnFontSelected(final Consumer<Font> onFontSelected) {
+        this.on_font_selected = onFontSelected;
+    }
+
+    public void setInitialFont(final Font initialFont) {
+        this.font = initialFont;
+    }
+}
diff --git a/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/properties/MiscTabController.java b/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/properties/MiscTabController.java
index 0096866473..73782d03ad 100644
--- a/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/properties/MiscTabController.java
+++ b/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ui/properties/MiscTabController.java
@@ -97,6 +97,18 @@ public void initialize()
             model.setAreaOpacity((int)Math.round(opacitySlider.getValue()));
             updating = false;
         });
+
+        titleFont.setOnFontSelected(font -> new ChangeFontCommand(model, undo, model.getTitleFont(), font, (m, f) -> m.setTitleFont(f)));
+        titleFont.setInitialFont(model.getTitleFont());
+
+        labelFont.setOnFontSelected(font -> new ChangeFontCommand(model, undo, model.getLabelFont(), font, (m, f) -> m.setLabelFont(f)));
+        labelFont.setInitialFont(model.getLabelFont());
+
+        scaleFont.setOnFontSelected(font -> new ChangeFontCommand(model, undo, model.getScaleFont(), font, (m, f) -> m.setScaleFont(f)));
+        scaleFont.setInitialFont(model.getScaleFont());
+
+        legendFont.setOnFontSelected(font -> new ChangeFontCommand(model, undo, model.getLegendFont(), font, (m, f) -> m.setLegendFont(f)));
+        legendFont.setInitialFont(model.getLegendFont());
     }
 
     // -----------------------------------------------------------------------