diff --git a/flutter/lib/common/widgets/peer_tab_page.dart b/flutter/lib/common/widgets/peer_tab_page.dart
index fa9ed29c0..39c633963 100644
--- a/flutter/lib/common/widgets/peer_tab_page.dart
+++ b/flutter/lib/common/widgets/peer_tab_page.dart
@@ -450,75 +450,49 @@ class _PeerSortDropdownState extends State<PeerSortDropdown> {
 
   @override
   Widget build(BuildContext context) {
-    final deco = BoxDecoration(
-      color: Theme.of(context).colorScheme.background,
-      borderRadius: BorderRadius.circular(5),
-    );
+    final enableStyle = TextStyle(
+        color: Theme.of(context).textTheme.titleLarge?.color,
+        fontSize: MenuConfig.fontSize,
+        fontWeight: FontWeight.normal);
+    final disableStyle = TextStyle(
+        color: Colors.grey,
+        fontSize: MenuConfig.fontSize,
+        fontWeight: FontWeight.normal);
+    List<PopupMenuEntry> items = List.empty(growable: true);
+    items.add(PopupMenuItem(
+        enabled: false,
+        child: Text(translate("Sort by"), style: disableStyle)));
+    for (var e in PeerSortType.values) {
+      items.add(PopupMenuItem(
+          child: Obx(() => getRadio(
+                  Text(translate(e), style: enableStyle), e, peerSort.value,
+                  (String? v) async {
+                if (v != null) {
+                  peerSort.value = v;
+                  await bind.setLocalFlutterConfig(
+                    k: "peer-sorting",
+                    v: peerSort.value,
+                  );
+                }
+              }))));
+    }
 
-    final translated_text = {
-      for (var e in PeerSortType.values) e: translate(e)
-    };
-
-    final double max_width =
-        50 + translated_text.values.map((e) => e.length).reduce(max) * 10;
-    return Container(
-      padding: EdgeInsets.all(4.0),
-      decoration: deco,
-      child: DropdownButtonHideUnderline(
-        child: DropdownButton2<String>(
-            onChanged: (v) async {
-              if (v != null) {
-                setState(() => peerSort.value = v);
-                await bind.setLocalFlutterConfig(
-                  k: "peer-sorting",
-                  v: peerSort.value,
-                );
-              }
-            },
-            customButton: Icon(
-              Icons.sort,
-              size: 18,
-            ),
-            isExpanded: true,
-            dropdownStyleData: DropdownStyleData(
-              decoration: BoxDecoration(
-                color: Theme.of(context).cardColor,
-                borderRadius: BorderRadius.circular(10),
-              ),
-              width: max_width,
-            ),
-            items: [
-              DropdownMenuItem<String>(
-                alignment: Alignment.center,
-                child: Text(
-                  translate("Sort by"),
-                  style: TextStyle(fontWeight: FontWeight.bold),
-                ),
-                enabled: false,
-              ),
-              ...translated_text.entries
-                  .map<DropdownMenuItem<String>>(
-                    (MapEntry entry) => DropdownMenuItem<String>(
-                      value: entry.key,
-                      child: Row(
-                        children: [
-                          Icon(
-                            entry.key == peerSort.value
-                                ? Icons.radio_button_checked_rounded
-                                : Icons.radio_button_off_rounded,
-                            size: 18,
-                          ).paddingOnly(right: 12),
-                          Text(
-                            entry.value,
-                            overflow: TextOverflow.ellipsis,
-                          ),
-                        ],
-                      ),
-                    ),
-                  )
-                  .toList(),
-            ]),
+    return InkWell(
+      child: Icon(
+        Icons.sort,
+        size: 18,
       ),
+      onTapDown: (details) {
+        final x = details.globalPosition.dx;
+        final y = details.globalPosition.dy;
+        final menuPos = RelativeRect.fromLTRB(x, y, x, y);
+        showMenu(
+          context: context,
+          position: menuPos,
+          items: items,
+          elevation: 8,
+        );
+      },
     );
   }
 }
diff --git a/flutter/lib/mobile/pages/settings_page.dart b/flutter/lib/mobile/pages/settings_page.dart
index c08a3b1b4..7d85b8c85 100644
--- a/flutter/lib/mobile/pages/settings_page.dart
+++ b/flutter/lib/mobile/pages/settings_page.dart
@@ -317,8 +317,8 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
                   await AndroidPermissionManager.request(
                       kRequestIgnoreBatteryOptimizations);
                 } else {
-                  final res = await gFFI.dialogManager
-                      .show<bool>((setState, close, context) => CustomAlertDialog(
+                  final res = await gFFI.dialogManager.show<bool>(
+                      (setState, close, context) => CustomAlertDialog(
                             title: Text(translate("Open System Setting")),
                             content: Text(translate(
                                 "android_open_battery_optimizations_tip")),
@@ -506,12 +506,12 @@ void showLanguageSettings(OverlayDialogManager dialogManager) async {
     final langs = json.decode(await bind.mainGetLangs()) as List<dynamic>;
     var lang = bind.mainGetLocalOption(key: "lang");
     dialogManager.show((setState, close, context) {
-      setLang(v) {
+      setLang(v) async {
         if (lang != v) {
           setState(() {
             lang = v;
           });
-          bind.mainSetLocalOption(key: "lang", value: v);
+          await bind.mainSetLocalOption(key: "lang", value: v);
           HomePage.homeKey.currentState?.refreshPages();
           Future.delayed(Duration(milliseconds: 200), close);
         }