diff --git a/scm-ui-components/packages/ui-components/src/LinkPaginator.js b/scm-ui-components/packages/ui-components/src/LinkPaginator.js
index d09306e04c..900107f4c1 100644
--- a/scm-ui-components/packages/ui-components/src/LinkPaginator.js
+++ b/scm-ui-components/packages/ui-components/src/LinkPaginator.js
@@ -1,18 +1,26 @@
 //@flow
 import React from "react";
-import {translate} from "react-i18next";
-import type {PagedCollection} from "@scm-manager/ui-types";
-import {Button} from "./buttons";
+import { translate } from "react-i18next";
+import type { PagedCollection } from "@scm-manager/ui-types";
+import { Button } from "./buttons";
 
 type Props = {
   collection: PagedCollection,
   page: number,
+  filter?: any,
 
   // context props
   t: string => string
 };
 
 class LinkPaginator extends React.Component<Props> {
+  addFilterToLink(link: string) {
+    const { filter } = this.props;
+    if (filter) {
+      return `${link}?q=${filter}`;
+    }
+    return link;
+  }
 
   renderFirstButton() {
     return (
@@ -20,7 +28,7 @@ class LinkPaginator extends React.Component<Props> {
         className={"pagination-link"}
         label={"1"}
         disabled={false}
-        link={"1"}
+        link={this.addFilterToLink("1")}
       />
     );
   }
@@ -34,7 +42,7 @@ class LinkPaginator extends React.Component<Props> {
         className={className}
         label={label ? label : previousPage.toString()}
         disabled={!this.hasLink("prev")}
-        link={`${previousPage}`}
+        link={this.addFilterToLink(`${previousPage}`)}
       />
     );
   }
@@ -52,7 +60,7 @@ class LinkPaginator extends React.Component<Props> {
         className={className}
         label={label ? label : nextPage.toString()}
         disabled={!this.hasLink("next")}
-        link={`${nextPage}`}
+        link={this.addFilterToLink(`${nextPage}`)}
       />
     );
   }
@@ -64,7 +72,7 @@ class LinkPaginator extends React.Component<Props> {
         className={"pagination-link"}
         label={`${collection.pageTotal}`}
         disabled={false}
-        link={`${collection.pageTotal}`}
+        link={this.addFilterToLink(`${collection.pageTotal}`)}
       />
     );
   }
@@ -118,7 +126,10 @@ class LinkPaginator extends React.Component<Props> {
     const { t } = this.props;
     return (
       <nav className="pagination is-centered" aria-label="pagination">
-        {this.renderPreviousButton("pagination-previous", t("paginator.previous"))}
+        {this.renderPreviousButton(
+          "pagination-previous",
+          t("paginator.previous")
+        )}
         <ul className="pagination-list">
           {this.pageLinks().map((link, index) => {
             return <li key={index}>{link}</li>;