diff --git a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
index 5e76ee56cf..8f1aa1cb49 100644
--- a/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Server/ServerCompositionTarget.cs
@@ -159,14 +159,15 @@ namespace Avalonia.Rendering.Composition.Server
             _redrawRequested = false;
             using (var targetContext = _renderTarget.CreateDrawingContext())
             {
-                var layerSize = Size * Scaling;
+                var size = Size;
+                var layerSize = size * Scaling;
                 if (layerSize != _layerSize || _layer == null || _layer.IsCorrupted)
                 {
                     _layer?.Dispose();
                     _layer = null;
-                    _layer = targetContext.CreateLayer(Size);
+                    _layer = targetContext.CreateLayer(size);
                     _layerSize = layerSize;
-                    _dirtyRect = new Rect(0, 0, layerSize.Width, layerSize.Height);
+                    _dirtyRect = new Rect(0, 0, size.Width, size.Height);
                 }
 
                 if (_dirtyRect.Width != 0 || _dirtyRect.Height != 0)
@@ -187,7 +188,7 @@ namespace Avalonia.Rendering.Composition.Server
                 else
                     targetContext.DrawBitmap(_layer, 1,
                         new Rect(_layerSize),
-                        new Rect(Size));
+                        new Rect(size));
 
                 if (DebugOverlays != RendererDebugOverlays.None)
                 {
diff --git a/src/Avalonia.DesignerSupport/DesignWindowLoader.cs b/src/Avalonia.DesignerSupport/DesignWindowLoader.cs
index eff190c39e..c248116614 100644
--- a/src/Avalonia.DesignerSupport/DesignWindowLoader.cs
+++ b/src/Avalonia.DesignerSupport/DesignWindowLoader.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using Avalonia.Controls;
+using Avalonia.Controls.Embedding.Offscreen;
 using Avalonia.Controls.Platform;
 using Avalonia.Markup.Xaml;
 using Avalonia.Styling;
@@ -13,6 +14,9 @@ namespace Avalonia.DesignerSupport
     public class DesignWindowLoader
     {
         public static Window LoadDesignerWindow(string xaml, string assemblyPath, string xamlFileProjectPath)
+            => LoadDesignerWindow(xaml, assemblyPath, xamlFileProjectPath, 1.0);
+
+        public static Window LoadDesignerWindow(string xaml, string assemblyPath, string xamlFileProjectPath, double renderScaling)
         {
             Window window;
             Control control;
@@ -96,6 +100,9 @@ namespace Avalonia.DesignerSupport
                     window = new Window() {Content = (Control)control};
                 }
 
+                if (window.PlatformImpl is OffscreenTopLevelImplBase offscreenImpl)
+                    offscreenImpl.RenderScaling = renderScaling;
+
                 Design.ApplyDesignModeProperties(window, control);
 
                 if (!window.IsSet(Window.SizeToContentProperty))
diff --git a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
index b6c0c3ae3d..9463224b99 100644
--- a/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
+++ b/src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs
@@ -67,8 +67,8 @@ namespace Avalonia.DesignerSupport.Remote
         {
             _transport.Send(new RequestViewportResizeMessage
             {
-                Width = clientSize.Width,
-                Height = clientSize.Height
+                Width = Math.Ceiling(clientSize.Width * RenderScaling),
+                Height = Math.Ceiling(clientSize.Height * RenderScaling)
             });
             ClientSize = clientSize;
             RenderAndSendFrameIfNeeded();
diff --git a/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
index 313063269b..6a6bc8c746 100644
--- a/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
+++ b/src/Avalonia.DesignerSupport/Remote/RemoteDesignerEntryPoint.cs
@@ -1,13 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Net;
 using System.Reflection;
 using System.Threading;
-using System.Xml;
 using Avalonia.Controls;
 using Avalonia.DesignerSupport.Remote.HtmlTransport;
-using Avalonia.Input;
 using Avalonia.Remote.Protocol;
 using Avalonia.Remote.Protocol.Designer;
 using Avalonia.Remote.Protocol.Viewport;
@@ -20,6 +17,7 @@ namespace Avalonia.DesignerSupport.Remote
         private static ClientSupportedPixelFormatsMessage s_supportedPixelFormats;
         private static ClientViewportAllocatedMessage s_viewportAllocatedMessage;
         private static ClientRenderInfoMessage s_renderInfoMessage;
+        private static double s_lastRenderScaling = 1.0;
 
         private static IAvaloniaRemoteTransportConnection s_transport;
         class CommandLineArgs
@@ -226,6 +224,9 @@ namespace Avalonia.DesignerSupport.Remote
             }
             if (obj is UpdateXamlMessage xaml)
             {
+                if (s_currentWindow is not null)
+                    s_lastRenderScaling = s_currentWindow.RenderScaling;
+
                 try
                 {
                     s_currentWindow?.Close();
@@ -237,7 +238,7 @@ namespace Avalonia.DesignerSupport.Remote
                 s_currentWindow = null;
                 try
                 {
-                    s_currentWindow = DesignWindowLoader.LoadDesignerWindow(xaml.Xaml, xaml.AssemblyPath, xaml.XamlFileProjectPath);
+                    s_currentWindow = DesignWindowLoader.LoadDesignerWindow(xaml.Xaml, xaml.AssemblyPath, xaml.XamlFileProjectPath, s_lastRenderScaling);
                     s_transport.Send(new UpdateXamlResultMessage(){Handle = s_currentWindow.PlatformImpl?.Handle?.Handle.ToString()});
                 }
                 catch (Exception e)