diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index 92f74530e2..2dd391945b 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -901,10 +901,10 @@ namespace Avalonia.Controls
             {
                 if (owner != null)
                 {
-                    // TODO: We really need non-client size here.
+                    var ownerSize = owner.FrameSize ?? owner.ClientSize;
                     var ownerRect = new PixelRect(
                         owner.Position,
-                        PixelSize.FromSize(owner.ClientSize, scaling));
+                        PixelSize.FromSize(ownerSize, scaling));
                     Position = ownerRect.CenterRect(rect).Position;
                 }
             }