diff --git a/src/app/controllers/row.js b/src/app/controllers/row.js
index 55a838826bc..906e721851c 100644
--- a/src/app/controllers/row.js
+++ b/src/app/controllers/row.js
@@ -103,6 +103,7 @@ function (angular, app, _) {
       var _as = 12 - $scope.dashboard.rowSpan($scope.row);
 
       $scope.panel = {
+        title: 'no title [click here]',
         error   : false,
         span    : _as < defaultSpan && _as > 0 ? _as : defaultSpan,
         editable: true,
diff --git a/src/app/directives/grafanaGraph.js b/src/app/directives/grafanaGraph.js
index f63eff7e1d3..75aa0999e56 100755
--- a/src/app/directives/grafanaGraph.js
+++ b/src/app/directives/grafanaGraph.js
@@ -68,7 +68,7 @@ function (angular, $, kbn, moment, _, GraphTooltip) {
               height = parseInt(height.replace('px', ''), 10);
             }
 
-            height = height - 32; // subtract panel title bar
+            height -= scope.panel.title ? 24 : 9; // subtract panel title bar
 
             if (scope.panel.legend.show && !scope.panel.legend.rightSide) {
               height = height - 21; // subtract one line legend
diff --git a/src/css/less/panel.less b/src/css/less/panel.less
index 7d24d1752c4..f7fd698a8a2 100644
--- a/src/css/less/panel.less
+++ b/src/css/less/panel.less
@@ -17,6 +17,7 @@
 
 .panel-title-container {
   min-height: 5px;
+  padding-top: 4px;
   cursor: context-menu;
 }
 
@@ -24,7 +25,6 @@
   border: 0px;
   font-weight: bold;
   position: relative;
-  font-size: 0.9em;
   cursor: context-menu;
 }