diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index 349b5abcc..17e45ba95 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -725,6 +725,7 @@ Future<bool> matchPeer(String searchText, Peer peer) async {
 }
 
 Future<List<Peer>>? matchPeers(String searchText, List<Peer> peers) async {
+  searchText = searchText.trim();
   if (searchText.isEmpty) {
     return peers;
   }
@@ -738,4 +739,4 @@ Future<List<Peer>>? matchPeers(String searchText, List<Peer> peers) async {
     }
   }
   return filteredList;
-}
\ No newline at end of file
+}
diff --git a/src/ui/ab.tis b/src/ui/ab.tis
index 658783623..ac2efb7dd 100644
--- a/src/ui/ab.tis
+++ b/src/ui/ab.tis
@@ -245,7 +245,7 @@ class SearchBar: Reactor.Component {
     }
 
     event change $(input) (_, el) {
-        this.onChange(el.value.trim());
+        this.onChange(el.value.trim().toLowerCase());
     }
     
     function onChange(v) {
@@ -297,8 +297,13 @@ class SessionList: Reactor.Component {
         if (!p) return this.sessions;
         var tmp = [];
         this.sessions.map(function(s) {
-            var name = s[4] || s.alias || s[0] || s.id || "";
-            if (name.indexOf(p) >= 0) tmp.push(s);
+            var name = (s[4] || s.alias || "").toLowerCase();
+            var id = (s[0] || s.id || "").toLowerCase();
+            var user = (s[1] || "").toLowerCase();
+            var hostname = (s[2] || "").toLowerCase();
+            if (name.indexOf(p) >= 0 || id.indexOf(p) >= 0 || user.indexOf(p) >= 0 || hostname.indexOf(p) >= 0) {
+                tmp.push(s);
+            }
         });
         return tmp;
     }