diff --git a/Userland/Libraries/LibGfx/ClassicWindowTheme.cpp b/Userland/Libraries/LibGfx/ClassicWindowTheme.cpp
index c0dd925d6d..67d1b72ea3 100644
--- a/Userland/Libraries/LibGfx/ClassicWindowTheme.cpp
+++ b/Userland/Libraries/LibGfx/ClassicWindowTheme.cpp
@@ -234,9 +234,9 @@ int ClassicWindowTheme::titlebar_height(WindowType window_type, WindowMode windo
     case WindowType::Normal:
     case WindowType::Notification: {
         if (window_mode == WindowMode::RenderAbove)
-            return max(palette.window_title_height() - 4, title_font.glyph_height() + 4);
+            return max(palette.window_title_height() - 4, title_font.pixel_size() + 2);
         else
-            return max(palette.window_title_height(), title_font.glyph_height() + 8);
+            return max(palette.window_title_height(), title_font.pixel_size() + 6);
     }
     default:
         return 0;