diff --git a/src/components/CategoryList/CategoryList.react.js b/src/components/CategoryList/CategoryList.react.js
index 60f0bd4eac..8b39b27cf7 100644
--- a/src/components/CategoryList/CategoryList.react.js
+++ b/src/components/CategoryList/CategoryList.react.js
@@ -122,7 +122,7 @@ export default class CategoryList extends React.Component {
           return (
             <div key={id}>
               <div className={styles.link}>
-                <Link title={c.name} to={{ pathname: link }} className={className} key={id}>
+                <Link title={c.name} to={{ pathname: link }} className={className} key={id} onClick={() => this.props.classClicked()}>
                   <span>{count}</span>
                   <span>{c.name}</span>
                 </Link>
diff --git a/src/dashboard/Data/Browser/Browser.react.js b/src/dashboard/Data/Browser/Browser.react.js
index 8abc9dcbe6..f7f05417d7 100644
--- a/src/dashboard/Data/Browser/Browser.react.js
+++ b/src/dashboard/Data/Browser/Browser.react.js
@@ -1883,8 +1883,28 @@ class Browser extends DashboardView {
         current={current}
         params={this.props.location?.search}
         linkPrefix={'browser/'}
-        filterClicked={url => this.props.navigate(generatePath(this.context, url))}
-        removeFilter={filter => this.removeFilter(filter)}
+        filterClicked={url => {
+          // Reset to page 1
+          this.setState({
+            skip: 0,
+          });
+
+          this.props.navigate(generatePath(this.context, url));
+        }}
+        removeFilter={filter => {
+          // Reset to page 1
+          this.setState({
+            skip: 0,
+          });
+
+          this.removeFilter(filter)
+        }}
+        classClicked={() => {
+          // Reset to page 1
+          this.setState({
+            skip: 0,
+          });
+        }}
         categories={allCategories}
       />
     );