diff --git a/Userland/Applications/FontEditor/FontEditor.cpp b/Userland/Applications/FontEditor/FontEditor.cpp
index bd4130b444..9ef1d6aed6 100644
--- a/Userland/Applications/FontEditor/FontEditor.cpp
+++ b/Userland/Applications/FontEditor/FontEditor.cpp
@@ -442,6 +442,9 @@ void FontEditorWidget::initialize(const String& path, RefPtr<Gfx::BitmapFont>&&
 
     m_presentation_spinbox->set_value(m_edited_font->presentation_size());
     m_spacing_spinbox->set_value(m_edited_font->glyph_spacing());
+
+    m_mean_line_spinbox->set_range(0, max(m_edited_font->glyph_height() - 2, 0), false);
+    m_baseline_spinbox->set_range(0, max(m_edited_font->glyph_height() - 2, 0), false);
     m_mean_line_spinbox->set_value(m_edited_font->mean_line());
     m_baseline_spinbox->set_value(m_edited_font->baseline());
 
diff --git a/Userland/Applications/FontEditor/FontEditorWindow.gml b/Userland/Applications/FontEditor/FontEditorWindow.gml
index aa82a25570..90cd70c3fe 100644
--- a/Userland/Applications/FontEditor/FontEditorWindow.gml
+++ b/Userland/Applications/FontEditor/FontEditorWindow.gml
@@ -175,7 +175,6 @@
                     @GUI::SpinBox {
                         name: "mean_line_spinbox"
                         min: 0
-                        max: 32
                     }
                 }
 
@@ -193,7 +192,6 @@
                     @GUI::SpinBox {
                         name: "baseline_spinbox"
                         min: 0
-                        max: 32
                     }
                 }