diff --git a/src/app/features/panel/panelHelper.js b/src/app/features/panel/panelHelper.js
index aa920079f23..c2842fb225e 100644
--- a/src/app/features/panel/panelHelper.js
+++ b/src/app/features/panel/panelHelper.js
@@ -54,6 +54,10 @@ function (angular, _, kbn, $) {
 
         scope.rangeUnparsed = scope.range;
       }
+
+      if (scope.panel.hideTimeOverride) {
+        scope.panelMeta.timeInfo = '';
+      }
     };
 
     this.issueMetricQuery = function(scope, datasource) {
diff --git a/src/app/features/panel/panelMenu.js b/src/app/features/panel/panelMenu.js
index d72b47cc977..a529dd87b5c 100644
--- a/src/app/features/panel/panelMenu.js
+++ b/src/app/features/panel/panelMenu.js
@@ -13,6 +13,7 @@ function (angular, $, _) {
           '<span class="panel-title drag-handle pointer">' +
             '<span class="panel-title-text drag-handle">{{panel.title | interpolateTemplateVars}}</span>' +
             '<span class="panel-links-icon"></span>' +
+            '<span class="panel-time-info" ng-show="panelMeta.timeInfo"><i class="fa fa-clock-o"></i> {{panelMeta.timeInfo}}</span>' +
           '</span>';
 
       function createMenuTemplate($scope) {
diff --git a/src/app/features/panel/panelSrv.js b/src/app/features/panel/panelSrv.js
index 45c9d745494..7411b887303 100644
--- a/src/app/features/panel/panelSrv.js
+++ b/src/app/features/panel/panelSrv.js
@@ -89,7 +89,7 @@ function (angular, _, config) {
       };
 
       $scope.getCurrentDatasource = function() {
-       if ($scope.datasource) {
+        if ($scope.datasource) {
           return $q.when($scope.datasource);
         }
 
diff --git a/src/app/features/panel/partials/panelTime.html b/src/app/features/panel/partials/panelTime.html
index 0c407cf2ff1..f5bfac1d8d9 100644
--- a/src/app/features/panel/partials/panelTime.html
+++ b/src/app/features/panel/partials/panelTime.html
@@ -5,7 +5,7 @@
 				<li class="tight-form-item tight-form-item-icon">
 					<i class="fa fa-clock-o"></i>
 				</li>
-				<li class="tight-form-item" style="width: 148px">
+				<li class="tight-form-item" style="width: 178px">
 					<strong>Override relative time</strong>
 				</li>
 				<li class="tight-form-item" style="width: 50px">
@@ -24,7 +24,7 @@
 				<li class="tight-form-item tight-form-item-icon">
 					<i class="fa fa-clock-o"></i>
 				</li>
-				<li class="tight-form-item" style="width: 148px">
+				<li class="tight-form-item" style="width: 178px">
 					<strong>Add time shift</strong>
 				</li>
 				<li class="tight-form-item" style="width: 50px">
@@ -38,6 +38,22 @@
 			</ul>
 			<div class="clearfix"></div>
 		</div>
+		<div class="tight-form">
+			<ul class="tight-form-list">
+				<li class="tight-form-item tight-form-item-icon">
+					<i class="fa fa-clock-o"></i>
+				</li>
+				<li class="tight-form-item" style="width: 178px">
+					<strong>Hide time override info</strong>
+				</li>
+				<li class="tight-form-item last">
+					<input class="cr1" id="panel.hideTimeOverride" type="checkbox"
+					ng-model="panel.hideTimeOverride" ng-checked="panel.hideTimeOverride" ng-change="get_data()">
+					<label for="panel.hideTimeOverride" class="cr1"></label>
+				</li>
+			</ul>
+			<div class="clearfix"></div>
+		</div>
 	</div>
 </div>
 
diff --git a/src/app/panels/graph/module.html b/src/app/panels/graph/module.html
index 09f2b4dbb59..b0793780fa8 100644
--- a/src/app/panels/graph/module.html
+++ b/src/app/panels/graph/module.html
@@ -3,9 +3,9 @@
 	<div class="graph-wrapper" ng-class="{'graph-legend-rightside': panel.legend.rightSide}">
 		<div class="graph-canvas-wrapper">
 
-			<span class="graph-time-info" ng-if="panelMeta.timeInfo">
-				<i class="fa fa-clock-o"></i> {{panelMeta.timeInfo}}
-		  </span>
+			<!-- <span class="graph&#45;time&#45;info" ng&#45;if="panelMeta.timeInfo"> -->
+			<!-- 	<i class="fa fa&#45;clock&#45;o"></i> {{panelMeta.timeInfo}} -->
+		  <!-- </span> -->
 
 			<div ng-if="datapointsWarning" class="datapoints-warning">
 				<span class="small" ng-show="!datapointsCount">
diff --git a/src/css/less/graph.less b/src/css/less/graph.less
index 46263a43988..665dbd4f4ce 100644
--- a/src/css/less/graph.less
+++ b/src/css/less/graph.less
@@ -141,7 +141,6 @@
     vertical-align: top;
     position: relative;
     left: 4px;
-    top: -25px;
   }
 
   .graph-legend {
@@ -268,13 +267,4 @@
   font-size: 12px;
 }
 
-.graph-time-info {
-  font-weight: bold;
-  float: right;
-  margin-right: 15px;
-  color: @blue;
-  font-size: 85%;
-  position: relative;
-  top: -20px;
-}
 
diff --git a/src/css/less/panel.less b/src/css/less/panel.less
index e8c683ab371..6a8c2355b5b 100644
--- a/src/css/less/panel.less
+++ b/src/css/less/panel.less
@@ -169,4 +169,14 @@
   }
 }
 
+.panel-time-info {
+  font-weight: bold;
+  float: right;
+  margin-right: 15px;
+  color: @blue;
+  font-size: 85%;
+  position: absolute;
+  top: 0;
+  right: 0;
+}