diff --git a/scm-ui-components/packages/ui-components/src/buttons/CreateButton.js b/scm-ui-components/packages/ui-components/src/buttons/CreateButton.js
index 3df3e78680..155669754c 100644
--- a/scm-ui-components/packages/ui-components/src/buttons/CreateButton.js
+++ b/scm-ui-components/packages/ui-components/src/buttons/CreateButton.js
@@ -2,8 +2,8 @@
 import React from "react";
 import injectSheet from "react-jss";
 import { type ButtonProps } from "./Button";
-import SubmitButton from "./SubmitButton";
 import classNames from "classnames";
+import Button from "./Button";
 
 const styles = {
   spacing: {
@@ -19,7 +19,7 @@ class CreateButton extends React.Component<ButtonProps> {
     const { classes } = this.props;
     return (
       <div className={classNames("has-text-centered", classes.spacing)}>
-        <SubmitButton {...this.props} />
+        <Button color="primary" {...this.props} />
       </div>
     );
   }
diff --git a/scm-ui-components/packages/ui-components/src/buttons/SubmitButton.js b/scm-ui-components/packages/ui-components/src/buttons/SubmitButton.js
index 1a8604834b..3abf805749 100644
--- a/scm-ui-components/packages/ui-components/src/buttons/SubmitButton.js
+++ b/scm-ui-components/packages/ui-components/src/buttons/SubmitButton.js
@@ -4,7 +4,16 @@ import Button, { type ButtonProps } from "./Button";
 
 class SubmitButton extends React.Component<ButtonProps> {
   render() {
-    return <Button type="submit" color="primary" {...this.props} />;
+    return (
+      <Button
+        type="submit"
+        color="primary"
+        {...this.props}
+        action={() => {
+          window.scrollTo(0, 0);
+        }}
+      />
+    );
   }
 }
 
diff --git a/scm-ui/src/containers/Index.js b/scm-ui/src/containers/Index.js
index 71bd6b35c2..1878195ece 100644
--- a/scm-ui/src/containers/Index.js
+++ b/scm-ui/src/containers/Index.js
@@ -14,6 +14,7 @@ import {
 } from "../modules/indexResource";
 import PluginLoader from "./PluginLoader";
 import type { IndexResources } from "@scm-manager/ui-types";
+import ScrollToTop from "./ScrollToTop";
 
 type Props = {
   error: Error,
@@ -32,7 +33,6 @@ type State = {
 };
 
 class Index extends Component<Props, State> {
-
   constructor(props: Props) {
     super(props);
     this.state = {
@@ -66,9 +66,14 @@ class Index extends Component<Props, State> {
       return <Loading />;
     } else {
       return (
-        <PluginLoader loaded={ pluginsLoaded } callback={ this.pluginLoaderCallback }>
-          <App />
-        </PluginLoader>
+        <ScrollToTop>
+          <PluginLoader
+            loaded={pluginsLoaded}
+            callback={this.pluginLoaderCallback}
+          >
+            <App />
+          </PluginLoader>
+        </ScrollToTop>
       );
     }
   }
diff --git a/scm-ui/src/containers/ScrollToTop.js b/scm-ui/src/containers/ScrollToTop.js
new file mode 100644
index 0000000000..d48ea6531a
--- /dev/null
+++ b/scm-ui/src/containers/ScrollToTop.js
@@ -0,0 +1,23 @@
+// @flow
+import React from "react";
+import { withRouter } from "react-router-dom";
+
+
+type Props = {
+  location: any,
+  children: any
+}
+
+class ScrollToTop extends React.Component<Props> {
+  componentDidUpdate(prevProps) {
+    if (this.props.location.pathname !== prevProps.location.pathname) {
+      window.scrollTo(0, 0);
+    }
+  }
+
+  render() {
+    return this.props.children;
+  }
+}
+
+export default withRouter(ScrollToTop);