diff --git a/src/components/footer.js b/src/components/footer.js
index 7fd901c..430d173 100644
--- a/src/components/footer.js
+++ b/src/components/footer.js
@@ -87,9 +87,9 @@ const Footer = ({ intl }) => (
           <Link className="mr-3" to="/integrations">
             <FormattedMessage id="footer.integrations" />
           </Link>
-          <a className="mr-3" href="https://governance.kleros.io" rel="noopener noreferrer" target="_blank">
+          <Link className="mr-3" to="/governance">
             <FormattedMessage id="footer.governance" />
-          </a>
+          </Link>
           <Link className="mr-3" to="/escrow">
             <FormattedMessage id="footer.escrow" />
           </Link>
diff --git a/src/components/header.js b/src/components/header.js
index 44567b1..54bbd25 100644
--- a/src/components/header.js
+++ b/src/components/header.js
@@ -179,7 +179,7 @@ class Header extends React.Component {
                 <NavDropdown.Item href="https://forum.kleros.io" target="_blank" rel="noopener noreferrer">
                   <FormattedMessage id="header.forum" />
                 </NavDropdown.Item>
-                <NavDropdown.Item href="https://snapshot.org/#/kleros" target="_blank" rel="noopener noreferrer">
+                <NavDropdown.Item href="https://snapshot.org/#/kleros.eth" target="_blank" rel="noopener noreferrer">
                   <FormattedMessage id="header.voting" />
                 </NavDropdown.Item>
               </NavDropdown>