diff --git a/modules/juce_graphics/native/juce_Direct2DHwndContext_windows.cpp b/modules/juce_graphics/native/juce_Direct2DHwndContext_windows.cpp
index 96bc345078..02dc35cd34 100644
--- a/modules/juce_graphics/native/juce_Direct2DHwndContext_windows.cpp
+++ b/modules/juce_graphics/native/juce_Direct2DHwndContext_windows.cpp
@@ -428,7 +428,7 @@ public:
         {
             ScopedMultithread scopedMultithread { directX->getD2DMultithread() };
 
-            auto hr = swap.resize (size * (float) owner.getPhysicalPixelScaleFactor(), deviceContext);
+            auto hr = swap.resize (size, deviceContext);
             jassert (SUCCEEDED (hr));
             if (FAILED (hr))
                 teardown();
diff --git a/modules/juce_gui_basics/native/juce_Windowing_windows.cpp b/modules/juce_gui_basics/native/juce_Windowing_windows.cpp
index b7be9909ea..bcdf6ea38c 100644
--- a/modules/juce_gui_basics/native/juce_Windowing_windows.cpp
+++ b/modules/juce_gui_basics/native/juce_Windowing_windows.cpp
@@ -4776,21 +4776,21 @@ private:
         // and then tells the swap chain to present the next swap chain back buffer.
         direct2DContext->setPhysicalPixelScaleFactor ((float) peer.getPlatformScaleFactor());
 
-        if (direct2DContext->startFrame())
-        {
-            peer.handlePaint (*direct2DContext);
-            direct2DContext->endFrame();
+        if (! direct2DContext->startFrame())
+            return;
 
-           #if JUCE_DIRECT2D_METRICS
-            if (lastPaintStartTicks > 0)
-            {
-                direct2DContext->metrics->addValueTicks (Direct2DMetrics::messageThreadPaintDuration,
-                                                         Time::getHighResolutionTicks() - paintStartTicks);
-                direct2DContext->metrics->addValueTicks (Direct2DMetrics::frameInterval, paintStartTicks - lastPaintStartTicks);
-            }
-            lastPaintStartTicks = paintStartTicks;
-           #endif
+        peer.handlePaint (*direct2DContext);
+        direct2DContext->endFrame();
+
+       #if JUCE_DIRECT2D_METRICS
+        if (lastPaintStartTicks > 0)
+        {
+            direct2DContext->metrics->addValueTicks (Direct2DMetrics::messageThreadPaintDuration,
+                                                     Time::getHighResolutionTicks() - paintStartTicks);
+            direct2DContext->metrics->addValueTicks (Direct2DMetrics::frameInterval, paintStartTicks - lastPaintStartTicks);
         }
+        lastPaintStartTicks = paintStartTicks;
+       #endif
     }
 
     HWNDComponentPeer& peer;