diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs
index b407e88cd5619cbf7bff82575c6adda407959da2..59eacdc64301ddfab39d13040934d696bbcf7e58 100644
--- a/crates/settings_ui/src/page_data.rs
+++ b/crates/settings_ui/src/page_data.rs
@@ -3342,7 +3342,9 @@ pub(crate) fn settings_data() -> 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