diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/dashnav/dashnav.html
index bab27289aca..84d6d9c4faa 100644
--- a/public/app/features/dashboard/dashnav/dashnav.html
+++ b/public/app/features/dashboard/dashnav/dashnav.html
@@ -85,7 +85,7 @@
 					Back to dashboard
 				</a>
 			</li>
-			<li>
+			<li ng-if="!ctrl.dashboard.timepicker.hidden">
 				<gf-time-picker dashboard="ctrl.dashboard"></gf-time-picker>
 			</li>
 		</ul>
diff --git a/public/app/features/dashboard/timepicker/settings.html b/public/app/features/dashboard/timepicker/settings.html
index 8260422f679..8c40121eaed 100644
--- a/public/app/features/dashboard/timepicker/settings.html
+++ b/public/app/features/dashboard/timepicker/settings.html
@@ -9,6 +9,6 @@
       <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>
+    <gf-form-switch class="gf-form" label="Hide time picker" checked="ctrl.panel.hidden" 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 23e686bce15..a230dd53b4d 100644
--- a/public/app/features/dashboard/timepicker/timepicker.html
+++ b/public/app/features/dashboard/timepicker/timepicker.html
@@ -1,4 +1,4 @@
-<ul class="nav gf-timepicker-nav" ng-show="!ctrl.panel.disableTimePicker">
+<ul class="nav gf-timepicker-nav">
 
   <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)'>
diff --git a/public/dashboards/home.json b/public/dashboards/home.json
index e2eb67c5cb8..439b03a99af 100644
--- a/public/dashboards/home.json
+++ b/public/dashboards/home.json
@@ -68,7 +68,7 @@
     "to": "now"
   },
   "timepicker": {
-    "enable": false,
+    "hidden": true,
     "refresh_intervals": [
       "5s",
       "10s",