diff --git a/src/App.js b/src/App.js
index 2de2b9a..1ea65b2 100644
--- a/src/App.js
+++ b/src/App.js
@@ -19,6 +19,8 @@ import PrivacyPolicy from "./PrivacyPolicy";
 import Button from "./Button";
 import { CheckRounded as CheckRoundedIcon } from "@material-ui/icons";
 
+import RouteChangeTracker from './RouteChangeTracker';
+
 import Cookies from 'universal-cookie';
 
 import firebase from "firebase/app";
@@ -197,6 +199,7 @@ class App extends React.Component {
     return (
       <div className={this.state.theme}>
         <Router>
+          <RouteChangeTracker />
             {
               this.state.user !== null
               ?
diff --git a/src/Login.js b/src/Login.js
index 8dda8c4..91e60bb 100644
--- a/src/Login.js
+++ b/src/Login.js
@@ -22,8 +22,7 @@ export default function Login(props) {
 			signInSuccessWithAuthResult: () => false,
 		},
 	};
-
-	document.body.style.overflow = "hidden";
+	
 	document.title = "Login | Parandum";
 
 	return (
diff --git a/src/RouteChangeTracker.js b/src/RouteChangeTracker.js
new file mode 100644
index 0000000..3271ec8
--- /dev/null
+++ b/src/RouteChangeTracker.js
@@ -0,0 +1,13 @@
+import { withRouter } from "react-router-dom";
+
+export default withRouter(function RouteChangeTracker({ history, logEvent }) {
+	history.listen((location, action) => {
+		if (location.pathname === "/login") {
+			document.body.style.overflow = "hidden";
+		} else {
+			document.body.style.overflow = "auto";
+		}
+	});
+	
+	return null;
+})