diff --git a/scm-ui/src/repos/sources/components/content/StatePaginator.js b/scm-ui/src/repos/sources/components/content/StatePaginator.js
new file mode 100644
index 0000000000..ceedd5edaf
--- /dev/null
+++ b/scm-ui/src/repos/sources/components/content/StatePaginator.js
@@ -0,0 +1,138 @@
+//@flow
+import React from "react";
+import { translate } from "react-i18next";
+import type { PagedCollection } from "@scm-manager/ui-types";
+import { Button } from "@scm-manager/ui-components";
+
+type Props = {
+  collection: PagedCollection,
+  page: number,
+  updatePage: number => void,
+
+  // context props
+  t: string => string
+};
+
+class StatePaginator extends React.Component<Props> {
+  renderFirstButton() {
+    return (
+      <Button
+        className={"pagination-link"}
+        label={"1"}
+        disabled={false}
+        action={() => this.updateCurrentPage(1)}
+      />
+    );
+  }
+
+  updateCurrentPage = (newPage: number) => {
+    this.props.updatePage(newPage);
+  };
+
+  renderPreviousButton(label?: string) {
+    const { page } = this.props;
+    const previousPage = page - 1;
+
+    return (
+      <Button
+        className={"pagination-previous"}
+        label={label ? label : previousPage.toString()}
+        disabled={!this.hasLink("prev")}
+        action={() => this.updateCurrentPage(previousPage)}
+      />
+    );
+  }
+
+  hasLink(name: string) {
+    const { collection } = this.props;
+    return collection._links[name];
+  }
+
+  renderNextButton(label?: string) {
+    const { page } = this.props;
+    const nextPage = page + 1;
+    return (
+      <Button
+        className={"pagination-next"}
+        label={label ? label : nextPage.toString()}
+        disabled={!this.hasLink("next")}
+        action={() => this.updateCurrentPage(nextPage)}
+      />
+    );
+  }
+
+  renderLastButton() {
+    const { collection } = this.props;
+    return (
+      <Button
+        className={"pagination-link"}
+        label={`${collection.pageTotal}`}
+        disabled={false}
+        action={() => this.updateCurrentPage(collection.pageTotal)}
+      />
+    );
+  }
+
+  separator() {
+    return <span className="pagination-ellipsis">&hellip;</span>;
+  }
+
+  currentPage(page: number) {
+    return (
+      <Button
+        className="pagination-link is-current"
+        label={page}
+        disabled={true}
+        action={() => this.updateCurrentPage(page)}
+      />
+    );
+  }
+
+  pageLinks() {
+    const { collection } = this.props;
+
+    const links = [];
+    const page = collection.page + 1;
+    const pageTotal = collection.pageTotal;
+    if (page > 1) {
+      links.push(this.renderFirstButton());
+    }
+    if (page > 3) {
+      links.push(this.separator());
+    }
+    if (page > 2) {
+      links.push(this.renderPreviousButton());
+    }
+
+    links.push(this.currentPage(page));
+
+    if (page + 1 < pageTotal) {
+      links.push(this.renderNextButton());
+    }
+    if (page + 2 < pageTotal)
+      //if there exists pages between next and last
+      links.push(this.separator());
+    if (page < pageTotal) {
+      links.push(this.renderLastButton());
+    }
+
+    return links;
+  }
+
+  render() {
+    const { t } = this.props;
+    return (
+      <nav className="pagination is-centered" aria-label="pagination">
+        {this.renderPreviousButton(t("paginator.previous"))}
+        <ul className="pagination-list">
+          {this.pageLinks().map((link, index) => {
+            return <li key={index}>{link}</li>;
+          })}
+        </ul>
+        {this.renderNextButton(t("paginator.next"))}
+      </nav>
+    );
+  }
+}
+
+export default translate("commons")(StatePaginator);
diff --git a/scm-ui/src/repos/sources/containers/HistoryView.js b/scm-ui/src/repos/sources/containers/HistoryView.js
index c3cb423ef6..52f8f45512 100644
--- a/scm-ui/src/repos/sources/containers/HistoryView.js
+++ b/scm-ui/src/repos/sources/containers/HistoryView.js
@@ -6,13 +6,10 @@ import type {
   Repository,
   PagedCollection
 } from "@scm-manager/ui-types";
-import {
-  ErrorNotification,
-  Loading,
-  LinkPaginator
-} from "@scm-manager/ui-components";
+import { ErrorNotification, Loading } from "@scm-manager/ui-components";
 import { getHistory } from "./history";
 import ChangesetList from "../../components/changesets/ChangesetList";
+import StatePaginator from "../components/content/StatePaginator";
 
 type Props = {
   file: File,
@@ -40,7 +37,11 @@ class HistoryView extends React.Component<Props, State> {
 
   componentDidMount() {
     const { file } = this.props;
-    getHistory(file._links.history.href)
+    this.updateHistory(file._links.history.href);
+  }
+
+  updateHistory(link: string) {
+    getHistory(link)
       .then(result => {
         if (result.error) {
           this.setState({
@@ -54,25 +55,37 @@ class HistoryView extends React.Component<Props, State> {
             loaded: true,
             changesets: result.changesets,
             pageCollection: result.pageCollection,
-            page: result.pageCollection.page + 1
+            page: result.pageCollection.page
           });
         }
       })
       .catch(err => {});
   }
 
+  updatePage(page: number) {
+    const { file } = this.props;
+
+    this.updateHistory(file._links.history.href + "?page=" + page.toString());
+  }
+
   showHistory() {
     const { repository } = this.props;
     const { changesets, page, pageCollection } = this.state;
+    const currentPage = page == 0 ? 1 : page;
     return (
       <>
         <ChangesetList repository={repository} changesets={changesets} />
-        <LinkPaginator page={page} collection={pageCollection} />
+        <StatePaginator
+          page={currentPage}
+          collection={pageCollection}
+          updatePage={(newPage: number) => this.updatePage(newPage)}
+        />
       </>
     );
   }
 
   render() {
+    console.log(this.state);
     const { file } = this.props;
     const { loaded, error } = this.state;