diff --git a/src/main/resources/web/js/main.js b/src/main/resources/web/js/main.js
index 2362757ac690fb3c27bc6a6a54fbe3e2eead68a6..9fddd1013669d31589de758abb26de519eb30416 100644
--- a/src/main/resources/web/js/main.js
+++ b/src/main/resources/web/js/main.js
@@ -117,11 +117,11 @@ tpl.loadTemplates(['home', 'status', 'topology', 'header', 'switch', 'switch-lis
         });
     });
 
-setInterval(function () {
-    swl.fetch();
-}, 3000);
+var updating = true;
 
 setInterval(function () {
-    hl.fetch();
+    if(updating) {
+        swl.fetch();
+        hl.fetch();
+    }
 }, 3000);
-
diff --git a/src/main/resources/web/js/views/header.js b/src/main/resources/web/js/views/header.js
index a5fbe008e2bb5c113288a4eca6af131e33a8829c..65e49dde312ac3ab4c56a246c4afba150310c899 100644
--- a/src/main/resources/web/js/views/header.js
+++ b/src/main/resources/web/js/views/header.js
@@ -24,6 +24,9 @@ window.HeaderView = Backbone.View.extend({
 
     render:function (eventName) {
         $(this.el).html(this.template());
+        $('#live-updates', this.el).change(function () {
+            updating = $(this).is(':checked');
+        })
         // $('.navbar-search', this.el).append(this.searchresultsView.render().el);
         return this;
     },
diff --git a/src/main/resources/web/tpl/header.html b/src/main/resources/web/tpl/header.html
index 78045ef69aa31ab758eda3716232c18230a205dc..b1c734b7b6e72301abd9c397da0543342806f731 100644
--- a/src/main/resources/web/tpl/header.html
+++ b/src/main/resources/web/tpl/header.html
@@ -16,11 +16,18 @@
                     <li><a href="/hosts">Hosts</a></li>
                     <!-- <li><a href="/vlans">VLANs</a></li> -->
                 </ul>
+                <!--
                 <form id="searchForm" class="navbar-search pull-right dropdown">
                     <input id="searchText" type="text" class="search-query dropdown-toggle"
                            placeholder="Search (try an IP or MAC address)">
                 </form>
+            -->
             </div> <!--/.nav-collapse -->
+            <form class="navbar-form pull-right">
+                <label class="checkbox">
+                    <input type="checkbox" id="live-updates" checked="yes">Live updates
+                </label>
+            </form>
         </div>
     </div>
 </div>