diff --git a/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/README.md b/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/README.md
index 612c56b7a4..96f60d2ce9 100644
--- a/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/README.md
+++ b/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/README.md
@@ -1,4 +1,5 @@
 # MESA PreBuilt Libraries
 
 The Binaries in this folder are compiled from a custom version of [MESA](https://github.com/aerisarn/mesa-uwp). 
-These are based on this [tag](https://github.com/aerisarn/mesa-uwp/releases/tag/alpha-2-resfix).
+These are based on this [branch](https://github.com/aerisarn/mesa-uwp/releases/tag/alpha-2-hack-fixes), which is the
+stable branch for MESA integration into Retroarch.
diff --git a/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libEGL.dll b/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libEGL.dll
index 14e0193610..b01e883603 100644
Binary files a/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libEGL.dll and b/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libEGL.dll differ
diff --git a/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libGLESv2.dll b/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libGLESv2.dll
index 8b1d082bb9..ad97bfe2b7 100644
Binary files a/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libGLESv2.dll and b/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libGLESv2.dll differ
diff --git a/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libgallium_wgl.dll b/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libgallium_wgl.dll
index 997d50c44d..98c84ebfa7 100644
Binary files a/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libgallium_wgl.dll and b/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libgallium_wgl.dll differ
diff --git a/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libglapi.dll b/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libglapi.dll
index 4a03c7ca5b..7d2c750558 100644
Binary files a/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libglapi.dll and b/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/libglapi.dll differ
diff --git a/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/opengl32.dll b/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/opengl32.dll
index 115453416a..2603e9fc93 100644
Binary files a/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/opengl32.dll and b/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/opengl32.dll differ
diff --git a/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/z-1.dll b/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/z-1.dll
index 85bfcf541a..c373354125 100644
Binary files a/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/z-1.dll and b/pkg/msvc-uwp/RetroArch-msvcUWP/MESA/x64/z-1.dll differ
diff --git a/uwp/uwp_main.cpp b/uwp/uwp_main.cpp
index 92bbfd0acf..15266cdb41 100644
--- a/uwp/uwp_main.cpp
+++ b/uwp/uwp_main.cpp
@@ -939,8 +939,13 @@ extern "C" {
       return (void*)CoreWindow::GetForCurrentThread();
    }
 
+   int current_height = -1;
+
    int uwp_get_height(void)
    {
+       if (current_height != -1)
+           return current_height;
+
       /* This function must be performed within UI thread,
        * otherwise it will cause a crash in specific cases
        * https://github.com/libretro/RetroArch/issues/13491 */
@@ -974,11 +979,17 @@ extern "C" {
          if (corewindow)
             corewindow->Dispatcher->ProcessEvents(Windows::UI::Core::CoreProcessEventsOption::ProcessAllIfPresent);
       }
+      current_height = ret;
       return ret;
    }
 
+   int current_width = -1;
+
    int uwp_get_width(void)
    {
+       if (current_width != -1)
+           return current_width;
+
       /* This function must be performed within UI thread,
        * otherwise it will cause a crash in specific cases
        * https://github.com/libretro/RetroArch/issues/13491 */
@@ -1012,7 +1023,7 @@ extern "C" {
          if (corewindow)
             corewindow->Dispatcher->ProcessEvents(Windows::UI::Core::CoreProcessEventsOption::ProcessAllIfPresent);
       }
-
+      current_width = returnValue;
       return returnValue;
    }