diff --git a/src/Perspex.Application/Designer/DesignerAssist.cs b/src/Perspex.Application/Designer/DesignerAssist.cs
index d0dc3c844c..de5518317f 100644
--- a/src/Perspex.Application/Designer/DesignerAssist.cs
+++ b/src/Perspex.Application/Designer/DesignerAssist.cs
@@ -76,8 +76,11 @@ namespace Perspex.DesignerSupport
 
                 if (window == null)
                 {
-                    window = new Window() {Content = original, SizeToContent = SizeToContent.WidthAndHeight};
+                    window = new Window() {Content = original};
                 }
+
+                if (!window.IsSet(Window.SizeToContentProperty))
+                    window.SizeToContent = SizeToContent.WidthAndHeight;
             }
 
             s_currentWindow?.Close();