diff --git a/lib/router.dart b/lib/router.dart
index fb37b1d1d..142a2e2f8 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -578,7 +578,9 @@ Route<dynamic> createRoute(RouteSettings settings) {
       return MaterialPageRoute<void>(builder: (_) => getIt.get<Modify2FAPage>());
 
     case Routes.homeSettings:
-      return CupertinoPageRoute<void>(builder: (_) => getIt.get<HomeSettingsPage>());
+      return CupertinoPageRoute<void>(
+        builder: (_) => getIt.get<HomeSettingsPage>(param1: settings.arguments),
+      );
 
     default:
       return MaterialPageRoute<void>(
diff --git a/lib/src/screens/dashboard/home_settings_page.dart b/lib/src/screens/dashboard/home_settings_page.dart
index df2e5de48..ed83d7b3c 100644
--- a/lib/src/screens/dashboard/home_settings_page.dart
+++ b/lib/src/screens/dashboard/home_settings_page.dart
@@ -33,23 +33,25 @@ class HomeSettingsPage extends BasePage {
           ),
           Row(
             children: [
-              TextFormField(
-                controller: _searchController,
-                style: TextStyle(color: Theme.of(context).primaryTextTheme.titleLarge!.color!),
-                decoration: InputDecoration(
-                  hintText: "S.of(context).search_token",
-                  prefixIcon: Image.asset("assets/images/search_icon.png"),
-                  filled: true,
-                  fillColor: Theme.of(context).accentTextTheme.displaySmall!.color!,
-                  alignLabelWithHint: false,
-                  contentPadding: const EdgeInsets.symmetric(vertical: 4, horizontal: 16),
-                  enabledBorder: OutlineInputBorder(
-                    borderRadius: BorderRadius.circular(14),
-                    borderSide: const BorderSide(color: Colors.transparent),
-                  ),
-                  focusedBorder: OutlineInputBorder(
-                    borderRadius: BorderRadius.circular(14),
-                    borderSide: const BorderSide(color: Colors.transparent),
+              Expanded(
+                child: TextFormField(
+                  controller: _searchController,
+                  style: TextStyle(color: Theme.of(context).primaryTextTheme.titleLarge!.color!),
+                  decoration: InputDecoration(
+                    hintText: "S.of(context).search_token",
+                    prefixIcon: Image.asset("assets/images/search_icon.png"),
+                    filled: true,
+                    fillColor: Theme.of(context).accentTextTheme.displaySmall!.color!,
+                    alignLabelWithHint: false,
+                    contentPadding: const EdgeInsets.symmetric(vertical: 4, horizontal: 16),
+                    enabledBorder: OutlineInputBorder(
+                      borderRadius: BorderRadius.circular(14),
+                      borderSide: const BorderSide(color: Colors.transparent),
+                    ),
+                    focusedBorder: OutlineInputBorder(
+                      borderRadius: BorderRadius.circular(14),
+                      borderSide: const BorderSide(color: Colors.transparent),
+                    ),
                   ),
                 ),
               ),