diff --git a/lib/pages/search.dart b/lib/pages/search.dart
index deb2ec87..171f509d 100644
--- a/lib/pages/search.dart
+++ b/lib/pages/search.dart
@@ -131,11 +131,18 @@ class SearchController extends State<Search> {
     setState(() {});
   }
 
+  bool _init = false;
+
   @override
   Widget build(BuildContext context) {
-    alias = VRouter.of(context).queryParameters['query'];
-    if (alias != null) genericSearchTerm ??= alias;
+    if (!_init) {
+      _init = true;
+      controller.text = VRouter.of(context).queryParameters['query'] ?? '';
+      WidgetsBinding.instance
+          .addPostFrameCallback((_) => search(controller.text));
+    }
 
     return SearchView(this);
   }
 }
+// #fluffychat:matrix.org
\ No newline at end of file
diff --git a/lib/pages/views/search_view.dart b/lib/pages/views/search_view.dart
index c6defcff..a0f9b5ad 100644
--- a/lib/pages/views/search_view.dart
+++ b/lib/pages/views/search_view.dart
@@ -62,7 +62,8 @@ class SearchView extends StatelessWidget {
     );
     return DefaultTabController(
       length: 3,
-      initialIndex: 1,
+      initialIndex:
+          controller.controller.text?.startsWith('#') ?? false ? 0 : 1,
       child: Scaffold(
         appBar: AppBar(
           leading: BackButton(),