diff --git a/dashboard/dashboard/backend/table_state.py b/dashboard/dashboard/backend/table_state.py
index fc505b2..b0647ff 100644
--- a/dashboard/dashboard/backend/table_state.py
+++ b/dashboard/dashboard/backend/table_state.py
@@ -62,14 +62,16 @@ def filtered_sorted_items(self) -> List[Item]:
                     ]
                 )
             ]
-
+            self.total_items = len(items)
+        else:
+            self.total_items = len(self.items)
         return items
 
     @rx.var(cache=True)
     def page_number(self) -> int:
         return (self.offset // self.limit) + 1
 
-    @rx.var(cache=True)
+    @rx.var(cache=False)
     def total_pages(self) -> int:
         return (self.total_items // self.limit) + (
             1 if self.total_items % self.limit else 1
diff --git a/dashboard/dashboard/views/table.py b/dashboard/dashboard/views/table.py
index b6be1e5..5fb37d2 100644
--- a/dashboard/dashboard/views/table.py
+++ b/dashboard/dashboard/views/table.py
@@ -149,7 +149,7 @@ def main_table() -> rx.Component:
                     width="100%",
                     variant="surface",
                     color_scheme="gray",
-                    on_change=TableState.set_search_value,
+                    on_change=[TableState.set_search_value, TableState.first_page]
                 ),
                 align="center",
                 justify="end",