diff --git a/lib/screens/files/file_list.dart b/lib/screens/files/file_list.dart
index 52b921bd..12f54631 100644
--- a/lib/screens/files/file_list.dart
+++ b/lib/screens/files/file_list.dart
@@ -43,6 +43,7 @@ class FileListScreen extends HookConsumerWidget {
           constraints: const BoxConstraints(maxWidth: 400, minHeight: 32),
           hintText: 'Search files...',
           hintStyle: WidgetStatePropertyAll(TextStyle(fontSize: 14)),
+          textStyle: WidgetStatePropertyAll(TextStyle(fontSize: 14)),
           onChanged: (value) {
             // Update the query state that will be passed to FileListView
             query.value = value.isEmpty ? null : value;
@@ -104,25 +105,26 @@ class FileListScreen extends HookConsumerWidget {
             )
           : null,
       body: usageAsync.when(
-        data: (usage) => quotaAsync.when(
-          data: (quota) => FileListView(
-            usage: usage,
-            quota: quota,
-            currentPath: currentPath,
-            selectedPool: selectedPool,
-            onPickAndUpload: () => _pickAndUploadFile(
-              ref,
-              currentPath.value,
-              selectedPool.value?.id,
+          data: (usage) => quotaAsync.when(
+            data: (quota) => FileListView(
+              usage: usage,
+              quota: quota,
+              currentPath: currentPath,
+              selectedPool: selectedPool,
+              onPickAndUpload: () => _pickAndUploadFile(
+                ref,
+                currentPath.value,
+                selectedPool.value?.id,
+              ),
+              onShowCreateDirectory: _showCreateDirectoryDialog,
+              mode: mode,
+              viewMode: viewMode,
+              isSelectionMode: isSelectionMode,
+              query: query,
             ),
-            onShowCreateDirectory: _showCreateDirectoryDialog,
-            mode: mode,
-            viewMode: viewMode,
-            isSelectionMode: isSelectionMode,
+            loading: () => const Center(child: CircularProgressIndicator()),
+            error: (e, _) => Center(child: Text('Error loading quota')),
           ),
-          loading: () => const Center(child: CircularProgressIndicator()),
-          error: (e, _) => Center(child: Text('Error loading quota')),
-        ),
         loading: () => const Center(child: CircularProgressIndicator()),
         error: (e, _) => Center(child: Text('Error loading usage')),
       ),
@@ -305,4 +307,4 @@ class FileListScreen extends HookConsumerWidget {
       ),
     );
   }
-}
+}
\ No newline at end of file
diff --git a/lib/widgets/file_list_view.dart b/lib/widgets/file_list_view.dart
index c539951d..0455d115 100644
--- a/lib/widgets/file_list_view.dart
+++ b/lib/widgets/file_list_view.dart
@@ -40,6 +40,7 @@ class FileListView extends HookConsumerWidget {
   final ValueNotifier<FileListMode> mode;
   final ValueNotifier<FileListViewMode> viewMode;
   final ValueNotifier<bool> isSelectionMode;
+  final ValueNotifier<String?> query;
 
   const FileListView({
     required this.usage,
@@ -51,6 +52,7 @@ class FileListView extends HookConsumerWidget {
     required this.mode,
     required this.viewMode,
     required this.isSelectionMode,
+    required this.query,
     super.key,
   });
 
@@ -75,7 +77,6 @@ class FileListView extends HookConsumerWidget {
     final isSelectionMode = useState<bool>(false);
     final selectedFileIds = useState<Set<String>>({});
     final currentVisibleItems = useState<List<FileListItem>>([]);
-    final query = useState<String?>(null);
     final order = useState<String?>('date');
     final orderDesc = useState<bool>(true);
     final queryDebounceTimer = useRef<Timer?>(null);
@@ -101,16 +102,16 @@ class FileListView extends HookConsumerWidget {
     useEffect(() {
       // Sync query, order, and orderDesc filters
       if (mode.value == FileListMode.unindexed) {
-        unindexedNotifier.setQuery(query.value);
+        unindexedNotifier.setQuery(this.query.value);
         unindexedNotifier.setOrder(order.value);
         unindexedNotifier.setOrderDesc(orderDesc.value);
       } else {
-        cloudNotifier.setQuery(query.value);
+        cloudNotifier.setQuery(this.query.value);
         cloudNotifier.setOrder(order.value);
         cloudNotifier.setOrderDesc(orderDesc.value);
       }
       return null;
-    }, [query.value, order.value, orderDesc.value, mode.value]);
+    }, [this.query.value, order.value, orderDesc.value, mode.value]);
 
     final isRefreshing = ref.watch(
       mode.value == FileListMode.normal