diff --git a/src/cascadia/WpfTerminalControl/TerminalContainer.cs b/src/cascadia/WpfTerminalControl/TerminalContainer.cs
index 1e553bb95b0..b53a4605b54 100644
--- a/src/cascadia/WpfTerminalControl/TerminalContainer.cs
+++ b/src/cascadia/WpfTerminalControl/TerminalContainer.cs
@@ -138,7 +138,7 @@ internal void SetTheme(TerminalTheme theme, string fontFamily, short fontSize)
 
             NativeMethods.TerminalSetTheme(this.terminal, theme, fontFamily, fontSize, (int)dpiScale.PixelsPerInchX);
 
-            if (!this.RenderSize.IsEmpty)
+            if (!this.RenderSize.IsEmpty && !this.TerminalControlSize.IsEmpty)
             {
                 this.Resize(this.TerminalControlSize);
             }