diff --git a/public/app/features/panel/panel_menu.js b/public/app/features/panel/panel_menu.js
index bf420f7dc15..cb6f74fb89d 100644
--- a/public/app/features/panel/panel_menu.js
+++ b/public/app/features/panel/panel_menu.js
@@ -14,6 +14,7 @@ function (angular, $, _, Tether) {
           '<span class="panel-title drag-handle pointer">' +
             '<span class="icon-gf panel-alert-icon"></span>' +
             '<span class="panel-title-text drag-handle">{{ctrl.panel.title | interpolateTemplateVars:this}}</span>' +
+            '<span class="panel-help-text"><info-popover mode="bold">{{ctrl.panel.helpText}}</info-popover></span>' +
             '<span class="panel-links-btn"><i class="fa fa-external-link"></i></span>' +
             '<span class="panel-time-info" ng-show="ctrl.timeInfo"><i class="fa fa-clock-o"></i> {{ctrl.timeInfo}}</span>' +
           '</span>';
diff --git a/public/app/partials/panelgeneral.html b/public/app/partials/panelgeneral.html
index 99e56cc27de..077660302e9 100644
--- a/public/app/partials/panelgeneral.html
+++ b/public/app/partials/panelgeneral.html
@@ -27,6 +27,13 @@
 			</select>
 		</div>
 	</div>
+	<div class="gf-form-inline">
+   	<div class="gf-form max-width-42">
+   		<span class="gf-form-label width-8">Help Text</span>
+  		<input type="text" class="input-xxlarge tight-form-input" ng-model='ctrl.panel.helpText'></input>
+  		<input type="text" class="gf-form-input width-30" ng-model='ctrl.panel.helpText'></input>
+   	</div>
+   </div>
 </div>
 
 <panel-links-editor panel="ctrl.panel"></panel-links-editor>
diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index 42498c47ac3..877276b674b 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -244,6 +244,10 @@ $gf-form-margin: 0.25rem;
   padding-left: $spacer;
   color: $text-color-weak;
 
+  &--bold {
+    color: $text-color-emphasis;
+  }
+
   &--right-absolute {
     position: absolute;
     right: $spacer;