diff --git a/flutter/lib/common/widgets/peer_tab_page.dart b/flutter/lib/common/widgets/peer_tab_page.dart
index 0c24fe7ea..278f5861c 100644
--- a/flutter/lib/common/widgets/peer_tab_page.dart
+++ b/flutter/lib/common/widgets/peer_tab_page.dart
@@ -419,7 +419,10 @@ class _PeerSearchBarState extends State<PeerSearchBar> {
   Widget _buildSearchBar() {
     RxBool focused = false.obs;
     FocusNode focusNode = FocusNode();
-    focusNode.addListener(() => focused.value = focusNode.hasFocus);
+    focusNode.addListener(() {
+      focused.value = focusNode.hasFocus;
+      peerSearchTextController.selection = TextSelection(baseOffset: 0, extentOffset: peerSearchTextController.value.text.length);
+    });
     return Container(
       width: 120,
       decoration: BoxDecoration(
diff --git a/flutter/lib/desktop/pages/connection_page.dart b/flutter/lib/desktop/pages/connection_page.dart
index 2dae03250..699cc4495 100644
--- a/flutter/lib/desktop/pages/connection_page.dart
+++ b/flutter/lib/desktop/pages/connection_page.dart
@@ -64,6 +64,8 @@ class _ConnectionPageState extends State<ConnectionPage>
     });
     _idFocusNode.addListener(() {
       _idInputFocused.value = _idFocusNode.hasFocus;
+      // select all to faciliate removing text, just following the behavior of address input of chrome
+      _idController.selection = TextSelection(baseOffset: 0, extentOffset: _idController.value.text.length);
     });
     windowManager.addListener(this);
   }