diff --git a/public/app/plugins/panel/graph/alert_tab_ctrl.ts b/public/app/plugins/panel/graph/alert_tab_ctrl.ts
index 226f76f8243..778962d438c 100644
--- a/public/app/plugins/panel/graph/alert_tab_ctrl.ts
+++ b/public/app/plugins/panel/graph/alert_tab_ctrl.ts
@@ -21,7 +21,8 @@ export class AlertTabCtrl {
     this.panel.alerting.queryRange = this.panel.alerting.queryRange || '10m';
     this.panel.alerting.warnOperator = this.panel.alerting.warnOperator || '>';
     this.panel.alerting.critOperator = this.panel.alerting.critOperator || '>';
-    this.panel.alerting.title = this.panel.alerting.title || this.panel.title + ' alert';
+    var defaultTitle = (this.panelCtrl.dashboard.title + ' ' + this.panel.title + ' alert');
+    this.panel.alerting.title = this.panel.alerting.title || defaultTitle;
 
     this.panel.targets.map(target => {
       this.metricTargets.push(target);
diff --git a/public/app/plugins/panel/graph/partials/tab_alerting.html b/public/app/plugins/panel/graph/partials/tab_alerting.html
index addb6932d4d..e0f160efbb3 100644
--- a/public/app/plugins/panel/graph/partials/tab_alerting.html
+++ b/public/app/plugins/panel/graph/partials/tab_alerting.html
@@ -60,14 +60,14 @@
     <h5 class="section-heading">Alert info</h5>
     <div class="gf-form">
       <span class="gf-form-label width-10">Alert name</span>
-      <input type="text" class="gf-form-input width-18" ng-model="ctrl.panel.alerting.title">
+      <input type="text" class="gf-form-input width-22" ng-model="ctrl.panel.alerting.title">
     </div>
     <div class="gf-form-inline">
       <div class="gf-form">
         <span class="gf-form-label width-10" style="margin-top: -73px;">Alert description</span>
       </div>
       <div class="gf-form">
-        <textarea rows="5" ng-model="ctrl.panel.alerting.description" class="gf-form-input width-18"></textarea>
+        <textarea rows="5" ng-model="ctrl.panel.alerting.description" class="gf-form-input width-22"></textarea>
       </div>
     </div>
   </div>