diff --git a/src/proxy/gitlab/templates/proxy/gitlab.html b/src/proxy/gitlab/templates/proxy/gitlab.html
index aa94808..04258c4 100644
--- a/src/proxy/gitlab/templates/proxy/gitlab.html
+++ b/src/proxy/gitlab/templates/proxy/gitlab.html
@@ -29,6 +29,17 @@
 {% block head_js %}
 <script type="text/javascript">
   $(function(){
+    // By Default Gitlab uses an event listener to stop propagation on any links
+    //  and use HTML5 pseudo navigation. That was causing all links in our
+    //  headers and footers to send the user to the right location but
+    //  applying Gitlab CSS everywhere.
+    // The workaround below will run before the Gitlab event and will prevent
+    //  it to work.
+
+    $('.navbar a', 'footer').not('.dropdown-toggle').on("click",
+        function(evt) { evt.stopPropagation(); }
+    );
+
     $('div.panel-body div.automerge_widget').removeClass('hide');
   });
 </script>
diff --git a/src/templates/base.html b/src/templates/base.html
index 8cfa84d..66ac7c9 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -172,7 +172,7 @@
     <div class="row">&nbsp;</div>
 
     {% block footer %}
-    <div class="row">
+    <div class="footer row">
       <p class="col-lg-12 text-center">
         <a href="{% url 'opendata' %}"><img src="{{ STATIC_URL }}img/opendata3.png"/></a>
       </p>
--
libgit2 0.21.2