diff --git a/src/xenia/ui/window.cc b/src/xenia/ui/window.cc
index cf300a4b5..2abe73115 100644
--- a/src/xenia/ui/window.cc
+++ b/src/xenia/ui/window.cc
@@ -154,7 +154,9 @@ void Window::Layout() {
 
 void Window::Invalidate() {}
 
-void Window::OnDpiChanged(UIEvent* e) {}
+void Window::OnDpiChanged(UIEvent* e) {
+  // TODO(DrChat): Notify listeners.
+}
 
 void Window::OnResize(UIEvent* e) {
   ForEachListener([e](auto listener) { listener->OnResize(e); });
diff --git a/src/xenia/ui/window_win.cc b/src/xenia/ui/window_win.cc
index 97cf76e5c..1863dbb6e 100644
--- a/src/xenia/ui/window_win.cc
+++ b/src/xenia/ui/window_win.cc
@@ -311,15 +311,25 @@ void Win32Window::Resize(int32_t width, int32_t height) {
     return;
   }
 
-  RECT rc = {0, 0, width, height};
-  bool has_menu = !is_fullscreen() && (main_menu_ ? true : false);
-  AdjustWindowRect(&rc, GetWindowLong(hwnd_, GWL_STYLE), has_menu);
-  if (true) {
-    rc.right += 100 - rc.left;
-    rc.left = 100;
-    rc.bottom += 100 - rc.top;
+  // Scale width and height
+  int32_t scaled_width, scaled_height;
+  scaled_width = int32_t(width * get_dpi_scale());
+  scaled_height = int32_t(height * get_dpi_scale());
+
+  RECT rc = {0, 0, 0, 0};
+  GetWindowRect(hwnd_, &rc);
+  if (rc.top < 0) {
     rc.top = 100;
   }
+  if (rc.left < 0) {
+    rc.left = 100;
+  }
+
+  rc.right = rc.left + scaled_width;
+  rc.bottom = rc.top + scaled_height;
+
+  bool has_menu = !is_fullscreen() && (main_menu_ ? true : false);
+  AdjustWindowRect(&rc, GetWindowLong(hwnd_, GWL_STYLE), has_menu);
   MoveWindow(hwnd_, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top,
              TRUE);
 
@@ -334,6 +344,11 @@ void Win32Window::Resize(int32_t left, int32_t top, int32_t right,
   }
 
   RECT rc = {left, top, right, bottom};
+
+  // Scale width and height
+  rc.right = int32_t((right - left) * get_dpi_scale()) + left;
+  rc.bottom = int32_t((bottom - top) * get_dpi_scale()) + top;
+
   bool has_menu = !is_fullscreen() && (main_menu_ ? true : false);
   AdjustWindowRect(&rc, GetWindowLong(hwnd_, GWL_STYLE), has_menu);
   MoveWindow(hwnd_, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top,
@@ -342,6 +357,11 @@ void Win32Window::Resize(int32_t left, int32_t top, int32_t right,
   super::Resize(left, top, right, bottom);
 }
 
+void Win32Window::RawReposition(const RECT& rc) {
+  MoveWindow(hwnd_, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top,
+             TRUE);
+}
+
 void Win32Window::OnResize(UIEvent* e) {
   RECT client_rect;
   GetClientRect(hwnd_, &client_rect);
@@ -478,6 +498,11 @@ LRESULT Win32Window::WndProc(HWND hWnd, UINT message, WPARAM wParam,
     case WM_DISPLAYCHANGE:
       break;
     case WM_DPICHANGED: {
+      LPRECT rect = (LPRECT)lParam;
+      if (rect) {
+        RawReposition(*rect);
+      }
+
       auto e = UIEvent(this);
       OnDpiChanged(&e);
     } break;
diff --git a/src/xenia/ui/window_win.h b/src/xenia/ui/window_win.h
index 530aa3e7e..fcef2a764 100644
--- a/src/xenia/ui/window_win.h
+++ b/src/xenia/ui/window_win.h
@@ -49,6 +49,9 @@ class Win32Window : public Window {
   void Resize(int32_t left, int32_t top, int32_t right,
               int32_t bottom) override;
 
+  // (raw) Resize the window, no DPI scaling applied.
+  void RawReposition(const RECT& rc);
+
   bool Initialize() override;
   void Invalidate() override;
   void Close() override;