diff --git a/public/app/features/dashboard/timepicker/settings.html b/public/app/features/dashboard/timepicker/settings.html
index 1143f16e3b4..8260422f679 100644
--- a/public/app/features/dashboard/timepicker/settings.html
+++ b/public/app/features/dashboard/timepicker/settings.html
@@ -1,15 +1,14 @@
 <div class="editor-row">
-<div class="gf-form-group">
-	<div class="gf-form">
-		<span class="gf-form-label width-10">Auto-refresh</span>
-		<input type="text" class="gf-form-input max-width-25" ng-model="ctrl.panel.refresh_intervals" array-join>
-	</div>
-	<div class="gf-form">
-		<span class="gf-form-label width-10">Now delay now-</span>
-		<input type="text" class="gf-form-input max-width-25"
-				ng-model="ctrl.panel.nowDelay" placeholder="0m"
-				valid-time-span
-				bs-tooltip="'Enter 1m to ignore the last minute (because it can contain incomplete metrics)'"
-				data-placement="right">
-	</div>
+  <div class="gf-form-group">
+    <div class="gf-form">
+      <span class="gf-form-label width-10">Auto-refresh</span>
+      <input type="text" class="gf-form-input max-width-25" ng-model="ctrl.panel.refresh_intervals" array-join>
+    </div>
+    <div class="gf-form">
+      <span class="gf-form-label width-10">Now delay now-</span>
+      <input type="text" class="gf-form-input max-width-25" ng-model="ctrl.panel.nowDelay" placeholder="0m" valid-time-span bs-tooltip="'Enter 1m to ignore the last minute (because it can contain incomplete metrics)'"
+        data-placement="right">
+    </div>
+    <gf-form-switch class="gf-form" label="Disable Time picker" checked="ctrl.panel.disableTimePicker" label-class="width-10"></gf-form-switch>
+  </div>
 </div>
diff --git a/public/app/features/dashboard/timepicker/timepicker.html b/public/app/features/dashboard/timepicker/timepicker.html
index 12570b3f2b0..23e686bce15 100644
--- a/public/app/features/dashboard/timepicker/timepicker.html
+++ b/public/app/features/dashboard/timepicker/timepicker.html
@@ -1,34 +1,38 @@
-<ul class="nav gf-timepicker-nav">
+<ul class="nav gf-timepicker-nav" ng-show="!ctrl.panel.disableTimePicker">
 
-	<li class="dashnav-move-timeframe gf-timepicker-time-control" bs-tooltip="'Shift time backward <br> (left arrow key)'" data-placement="bottom">
-		<a ng-click='ctrl.move(-1)'><i class="fa fa-chevron-left"></i></a>
-	</li>
-	<li class="dashnav-zoom-out gf-timepicker-time-control" bs-tooltip="'Time range zoom out <br> CTRL+Z'" data-placement="bottom">
-		<a ng-click='ctrl.zoom(2)'>Zoom Out</a></li>
-	</li>
-	<li class="dashnav-move-timeframe gf-timepicker-time-control" bs-tooltip="'Shift time forward <br> (right arrow key)'" data-placement="bottom">
-		<a ng-click='ctrl.move(1)'><i class="fa fa-chevron-right"></i></a>
-	</li>
+  <li class="dashnav-move-timeframe gf-timepicker-time-control" bs-tooltip="'Shift time backward <br> (left arrow key)'" data-placement="bottom">
+    <a ng-click='ctrl.move(-1)'>
+      <i class="fa fa-chevron-left"></i>
+    </a>
+  </li>
+  <li class="dashnav-zoom-out gf-timepicker-time-control" bs-tooltip="'Time range zoom out <br> CTRL+Z'" data-placement="bottom">
+    <a ng-click='ctrl.zoom(2)'>Zoom Out</a>
+  </li>
+  </li>
+  <li class="dashnav-move-timeframe gf-timepicker-time-control" bs-tooltip="'Shift time forward <br> (right arrow key)'" data-placement="bottom">
+    <a ng-click='ctrl.move(1)'>
+      <i class="fa fa-chevron-right"></i>
+    </a>
+  </li>
 
-	<li>
-		<a bs-tooltip="ctrl.tooltip" data-placement="bottom" ng-click="ctrl.openDropdown()" class="gf-timepicker-nav-btn">
-			<i class="fa fa-clock-o"></i>
-			<span ng-bind="ctrl.rangeString"></span>
-			<span ng-show="ctrl.isUtc" class="gf-timepicker-utc">
-				UTC
-			</span>
+  <li>
+    <a bs-tooltip="ctrl.tooltip" data-placement="bottom" ng-click="ctrl.openDropdown()" class="gf-timepicker-nav-btn">
+      <i class="fa fa-clock-o"></i>
+      <span ng-bind="ctrl.rangeString"></span>
+      <span ng-show="ctrl.isUtc" class="gf-timepicker-utc">
+        UTC
+      </span>
 
-			<span ng-show="ctrl.dashboard.refresh" class="text-warning">
-				&nbsp;
-				Refresh every {{ctrl.dashboard.refresh}}
-			</span>
-		</a>
-	</li>
+      <span ng-show="ctrl.dashboard.refresh" class="text-warning">
+        &nbsp; Refresh every {{ctrl.dashboard.refresh}}
+      </span>
+    </a>
+  </li>
 
-	<li class="dashnav-refresh-action">
-		<a ng-click="ctrl.timeSrv.refreshDashboard()">
-			<i class="fa fa-refresh"></i>
-		</a>
-	</li>
+  <li class="dashnav-refresh-action">
+    <a ng-click="ctrl.timeSrv.refreshDashboard()">
+      <i class="fa fa-refresh"></i>
+    </a>
+  </li>
 
 </ul>