diff --git a/src/common/MainHeader.js b/src/common/MainHeader.js
index 18be02fc..8f8f222a 100644
--- a/src/common/MainHeader.js
+++ b/src/common/MainHeader.js
@@ -1,27 +1,33 @@
 import plusIcon from '@fortawesome/fontawesome-free-solid/faPlus';
 import FontAwesomeIcon from '@fortawesome/react-fontawesome';
 import React from 'react';
-import { Link } from 'react-router-dom';
+import { Link, withRouter } from 'react-router-dom'
 import { Collapse, Nav, Navbar, NavbarBrand, NavbarToggler, NavItem, NavLink } from 'reactstrap';
 import ServersDropdown from '../servers/ServersDropdown';
 import './MainHeader.scss';
 import shlinkLogo from './shlink-logo-white.png';
 
-export default class MainHeader extends React.Component {
+export class MainHeader extends React.Component {
   state = { isOpen: false };
   toggle = () => {
-    this.setState({
-      isOpen: !this.state.isOpen
-    });
+    this.setState(({ isOpen }) => ({
+      isOpen: !isOpen
+    }));
   };
 
+  componentDidUpdate(prevProps) {
+    if (this.props.location !== prevProps.location) {
+      this.setState({ isOpen: false });
+    }
+  }
+
   render() {
     return (
       <Navbar color="primary" dark fixed="top" className="main-header" expand="md">
         <NavbarBrand tag={Link} to="/">
           <img src={shlinkLogo} alt="Shlink" className="main-header__brand-logo"/> Shlink
         </NavbarBrand>
-        <NavbarToggler onClick={this.toggle}/>
+        <NavbarToggler onClick={this.toggle} />
         <Collapse navbar isOpen={this.state.isOpen}>
           <Nav navbar className="ml-auto">
             <NavItem>
@@ -36,3 +42,5 @@ export default class MainHeader extends React.Component {
     );
   }
 }
+
+export default withRouter(MainHeader);