diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index bb6c5e839a7bb6dca889c3e4f275a527c54fe8b0..e986c8f8908411bfd3363ad5e37d0c1cf1cafcf3 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -3280,7 +3280,9 @@ pub(crate) fn settings_data(cx: &App) -> Vec<SettingsPage> {
                     description: "Font size for terminal text. If not set, defaults to buffer font size",
                     field: Box::new(SettingField {
                         pick: |settings_content| {
-                            if let Some(terminal) = &settings_content.terminal {
+                            if let Some(terminal) = &settings_content.terminal
+                                && terminal.font_size.is_some()
+                            {
                                 &terminal.font_size
                             } else if settings_content.theme.buffer_font_size.is_some() {
                                 &settings_content.theme.buffer_font_size