diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
index 9f58b13dec0f9..05323aae776e4 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -917,9 +917,10 @@ void DesktopWindowTreeHostWin::HandleWindowSizeChanged() {
   // changed (can occur on Windows 10 when snapping a window to the side of
   // the screen). In that case do a resize to the current size to reenable
   // swaps.
-  if (compositor())
+  if (compositor()) {
     compositor()->SetScaleAndSize(compositor()->device_scale_factor(),
-                                  compositor()->size());
+                                  GetBounds().size());
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 7efa0a51c94b1..531b4881a52f5 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -1043,11 +1043,11 @@ void HWNDMessageHandler::PostProcessActivateMessage(
   } else if (background_fullscreen_hack_) {
     // Restore the bounds of the window to fullscreen.
     DCHECK(IsFullscreen());
-    background_fullscreen_hack_ = false;
     MONITORINFO monitor_info = {sizeof(monitor_info)};
     GetMonitorInfo(MonitorFromWindow(hwnd(), MONITOR_DEFAULTTOPRIMARY),
                    &monitor_info);
     SetBoundsInternal(gfx::Rect(monitor_info.rcMonitor), false);
+    background_fullscreen_hack_ = false;
   }
 }