diff --git a/web/src/component/SearchFiles.js b/web/src/component/SearchFiles.js
index 4dbfbf6..b80e0ba 100644
--- a/web/src/component/SearchFiles.js
+++ b/web/src/component/SearchFiles.js
@@ -66,6 +66,7 @@ function SearchFiles(props) {
         />
         <button
           onClick={() => {
+            setOffset(0);
             searchFiles();
           }}
         >
diff --git a/web/src/component/SearchFolders.js b/web/src/component/SearchFolders.js
index ec5b066..981b382 100644
--- a/web/src/component/SearchFolders.js
+++ b/web/src/component/SearchFolders.js
@@ -62,7 +62,12 @@ function SearchFolders() {
           type="text"
           placeholder="Enter folder name"
         />
-        <button onClick={searchFolder}>
+        <button
+          onClick={() => {
+            setOffset(0);
+            searchFolder();
+          }}
+        >
           {isLoading ? "Loading..." : "Search"}
         </button>
         <button onClick={lastPage}>Last page</button>