diff --git a/Src/SwqlStudio/Utils/DpiHelper.cs b/Src/SwqlStudio/Utils/DpiHelper.cs
index aea05ba63..08bb49fd1 100644
--- a/Src/SwqlStudio/Utils/DpiHelper.cs
+++ b/Src/SwqlStudio/Utils/DpiHelper.cs
@@ -31,7 +31,9 @@ internal static class DpiHelper
         /// <para>This should be called in the <paramref name="control"/>'s constructor.</para></remarks>
         public static void FixFont(Control control)
         {
+            control.SuspendLayout();
             control.Font = DefaultFont;
+            control.ResumeLayout();
         }
 
         /// <summary>