diff --git a/modules/openstack_project/files/gerrit/GerritSiteHeader.html b/modules/openstack_project/files/gerrit/GerritSiteHeader.html
index 21ceb84f59..535594079e 100644
--- a/modules/openstack_project/files/gerrit/GerritSiteHeader.html
+++ b/modules/openstack_project/files/gerrit/GerritSiteHeader.html
@@ -1,3 +1,5 @@
 <div>
+  <script type="text/javascript" src="static/jquery.min.js" />
+  <script type="text/javascript" src="static/hideci.js" />
   <a href="/"><h1 style="color: #CF2F19"><img src="static/title.png" style="vertical-align:middle;" /></h1></a>
 </div>
diff --git a/modules/openstack_project/files/gerrit/hideci.js b/modules/openstack_project/files/gerrit/hideci.js
new file mode 100644
index 0000000000..09e5a0b14c
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/hideci.js
@@ -0,0 +1,49 @@
+// Copyright (c) 2014 VMware, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+// this regex matches the hash part of review pages
+var hashRegex = /^\#\/c\/[\/\d]+$/
+// this regex matches CI comments
+var ciRegex = / CI$/
+
+window.onload = function() {
+    var input = document.createElement("input");
+    input.id = "toggleci";
+    input.type = "button";
+    input.className = "gwt-Button";
+    input.value = "Toggle CI";
+    input.onclick = function() {
+        // CI comments in New Screen
+        $("div").filter(function() {
+            return ciRegex.test(this.innerHTML);
+        }).parent().parent().parent().toggle();
+
+        // CI comments in Old Screen
+        $("div").filter(function() {
+            return ciRegex.test(this.getAttribute('name'));
+        }).toggle();
+    }
+    document.body.appendChild(input);
+    if (!hashRegex.test(window.location.hash)) {
+        $("#toggleci").hide();
+    }
+};
+
+window.onhashchange = function() {
+    if (hashRegex.test(window.location.hash)) {
+        $("#toggleci").show();
+    } else {
+        $("#toggleci").hide();
+    }
+};
diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index 9cee29dced..8e90f82407 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -259,6 +259,23 @@ class openstack_project::gerrit (
     require => Class['::gerrit'],
   }
 
+  package { 'libjs-jquery':
+    ensure => present,
+  }
+
+  file { '/home/gerrit2/review_site/static/jquery.min.js':
+    ensure  => present,
+    source  => '/usr/share/javascript/jquery/jquery.min.js',
+    require => [Class['::gerrit'],
+                Package['libjs-jquery']],
+  }
+
+  file { '/home/gerrit2/review_site/static/hideci.js':
+    ensure  => present,
+    source  => 'puppet:///modules/openstack_project/gerrit/hideci.js',
+    require => Class['::gerrit'],
+  }
+
   file { '/home/gerrit2/review_site/etc/GerritSite.css':
     ensure  => present,
     source  => 'puppet:///modules/openstack_project/gerrit/GerritSite.css',