diff --git a/ui/flutter/pubspec.lock b/ui/flutter/pubspec.lock
index fda93b4a..4e31be0e 100644
--- a/ui/flutter/pubspec.lock
+++ b/ui/flutter/pubspec.lock
@@ -458,8 +458,8 @@ packages:
     dependency: "direct main"
     description:
       path: flutter_inappwebview
-      ref: d579215760e1c1e58a4ff7601a6055b5e6adf8e8
-      resolved-ref: d579215760e1c1e58a4ff7601a6055b5e6adf8e8
+      ref: baef36d97d3fd16d4d637fb336f1ac8dcfe8a67d
+      resolved-ref: baef36d97d3fd16d4d637fb336f1ac8dcfe8a67d
       url: "https://github.com/GopeedLab/flutter_inappwebview.git"
     source: git
     version: "6.1.5"
@@ -467,8 +467,8 @@ packages:
     dependency: "direct overridden"
     description:
       path: flutter_inappwebview_android
-      ref: d579215760e1c1e58a4ff7601a6055b5e6adf8e8
-      resolved-ref: d579215760e1c1e58a4ff7601a6055b5e6adf8e8
+      ref: baef36d97d3fd16d4d637fb336f1ac8dcfe8a67d
+      resolved-ref: baef36d97d3fd16d4d637fb336f1ac8dcfe8a67d
       url: "https://github.com/GopeedLab/flutter_inappwebview.git"
     source: git
     version: "1.1.3"
@@ -484,8 +484,8 @@ packages:
     dependency: "direct overridden"
     description:
       path: flutter_inappwebview_ios
-      ref: d579215760e1c1e58a4ff7601a6055b5e6adf8e8
-      resolved-ref: d579215760e1c1e58a4ff7601a6055b5e6adf8e8
+      ref: baef36d97d3fd16d4d637fb336f1ac8dcfe8a67d
+      resolved-ref: baef36d97d3fd16d4d637fb336f1ac8dcfe8a67d
       url: "https://github.com/GopeedLab/flutter_inappwebview.git"
     source: git
     version: "1.1.2"
@@ -493,8 +493,8 @@ packages:
     dependency: "direct overridden"
     description:
       path: flutter_inappwebview_macos
-      ref: d579215760e1c1e58a4ff7601a6055b5e6adf8e8
-      resolved-ref: d579215760e1c1e58a4ff7601a6055b5e6adf8e8
+      ref: baef36d97d3fd16d4d637fb336f1ac8dcfe8a67d
+      resolved-ref: baef36d97d3fd16d4d637fb336f1ac8dcfe8a67d
       url: "https://github.com/GopeedLab/flutter_inappwebview.git"
     source: git
     version: "1.1.2"
@@ -502,8 +502,8 @@ packages:
     dependency: "direct overridden"
     description:
       path: flutter_inappwebview_platform_interface
-      ref: d579215760e1c1e58a4ff7601a6055b5e6adf8e8
-      resolved-ref: d579215760e1c1e58a4ff7601a6055b5e6adf8e8
+      ref: baef36d97d3fd16d4d637fb336f1ac8dcfe8a67d
+      resolved-ref: baef36d97d3fd16d4d637fb336f1ac8dcfe8a67d
       url: "https://github.com/GopeedLab/flutter_inappwebview.git"
     source: git
     version: "1.3.0+1"
@@ -516,12 +516,13 @@ packages:
     source: hosted
     version: "1.1.2"
   flutter_inappwebview_windows:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: flutter_inappwebview_windows
-      sha256: "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055"
-      url: "https://pub.dev"
-    source: hosted
+      path: flutter_inappwebview_windows
+      ref: baef36d97d3fd16d4d637fb336f1ac8dcfe8a67d
+      resolved-ref: baef36d97d3fd16d4d637fb336f1ac8dcfe8a67d
+      url: "https://github.com/GopeedLab/flutter_inappwebview.git"
+    source: git
     version: "0.6.0"
   flutter_launcher_icons:
     dependency: "direct dev"
@@ -1106,8 +1107,8 @@ packages:
     dependency: "direct overridden"
     description:
       path: permission_handler_windows
-      ref: "35fc72c30262b9b49e1965b48a7524b44ba9daa7"
-      resolved-ref: "35fc72c30262b9b49e1965b48a7524b44ba9daa7"
+      ref: ffcca00fb0ae2543f5bd6c83125ffba5755d3aa3
+      resolved-ref: ffcca00fb0ae2543f5bd6c83125ffba5755d3aa3
       url: "https://github.com/monkeyWie/flutter-permission-handler.git"
     source: git
     version: "0.2.1"
diff --git a/ui/flutter/pubspec.yaml b/ui/flutter/pubspec.yaml
index 6c485524..0cef1b9f 100644
--- a/ui/flutter/pubspec.yaml
+++ b/ui/flutter/pubspec.yaml
@@ -82,32 +82,38 @@ dependencies:
   go_router: ^16.2.1
 
 dependency_overrides:
-  # Public persistent-profile and proxy APIs; keep all packages on one commit.
+  # Public persistent-profile/proxy APIs and Windows C++20 build compatibility.
+  # Keep all fork packages on one commit.
   flutter_inappwebview:
     git:
       url: https://github.com/GopeedLab/flutter_inappwebview.git
-      ref: d579215760e1c1e58a4ff7601a6055b5e6adf8e8
+      ref: baef36d97d3fd16d4d637fb336f1ac8dcfe8a67d
       path: flutter_inappwebview
   flutter_inappwebview_platform_interface:
     git:
       url: https://github.com/GopeedLab/flutter_inappwebview.git
-      ref: d579215760e1c1e58a4ff7601a6055b5e6adf8e8
+      ref: baef36d97d3fd16d4d637fb336f1ac8dcfe8a67d
       path: flutter_inappwebview_platform_interface
   flutter_inappwebview_macos:
     git:
       url: https://github.com/GopeedLab/flutter_inappwebview.git
-      ref: d579215760e1c1e58a4ff7601a6055b5e6adf8e8
+      ref: baef36d97d3fd16d4d637fb336f1ac8dcfe8a67d
       path: flutter_inappwebview_macos
   flutter_inappwebview_ios:
     git:
       url: https://github.com/GopeedLab/flutter_inappwebview.git
-      ref: d579215760e1c1e58a4ff7601a6055b5e6adf8e8
+      ref: baef36d97d3fd16d4d637fb336f1ac8dcfe8a67d
       path: flutter_inappwebview_ios
   flutter_inappwebview_android:
     git:
       url: https://github.com/GopeedLab/flutter_inappwebview.git
-      ref: d579215760e1c1e58a4ff7601a6055b5e6adf8e8
+      ref: baef36d97d3fd16d4d637fb336f1ac8dcfe8a67d
       path: flutter_inappwebview_android
+  flutter_inappwebview_windows:
+    git:
+      url: https://github.com/GopeedLab/flutter_inappwebview.git
+      ref: baef36d97d3fd16d4d637fb336f1ac8dcfe8a67d
+      path: flutter_inappwebview_windows
   # Prevent a native Windows crash when the push notification service is unavailable.
   # Keep this fork until https://github.com/MaikuB/flutter_local_notifications/pull/2813 is merged and released.
   flutter_local_notifications:
@@ -122,11 +128,12 @@ dependency_overrides:
       path: flutter_local_notifications_windows
   # Upstream initializes a Windows Geolocator when the plugin registers, which
   # makes Windows report location access even when the app never requests it.
-  # Keep this fork until https://github.com/Baseflow/flutter-permission-handler/issues/1394 is fixed and released.
+  # Also removes legacy /await so the plugin uses standard C++20 coroutines.
+  # Keep this fork until the location-access and build fixes are released upstream.
   permission_handler_windows:
     git:
       url: https://github.com/monkeyWie/flutter-permission-handler.git
-      ref: 35fc72c30262b9b49e1965b48a7524b44ba9daa7
+      ref: ffcca00fb0ae2543f5bd6c83125ffba5755d3aa3
       path: permission_handler_windows
 
 dev_dependencies: