diff --git a/src/app/directives/grafanaPanel.js b/src/app/directives/grafanaPanel.js
index d0ec252559a..2a8493727bc 100644
--- a/src/app/directives/grafanaPanel.js
+++ b/src/app/directives/grafanaPanel.js
@@ -26,7 +26,7 @@ function (angular, $) {
             '<i class="icon-spinner icon-spin icon-large"></i>' +
           '</span>' +
 
-          '<div panel-menu></div>' +
+          '<div class="panel-title-container" panel-menu></div>' +
         '</div>'+
       '</div>';
 
diff --git a/src/app/directives/panelMenu.js b/src/app/directives/panelMenu.js
index 4ffb5c5cb81..c3ed0cea458 100644
--- a/src/app/directives/panelMenu.js
+++ b/src/app/directives/panelMenu.js
@@ -9,7 +9,7 @@ function (angular, $, _) {
   angular
     .module('grafana.directives')
     .directive('panelMenu', function($compile) {
-      var linkTemplate = '<a class="pointer panel-title">{{panel.title || interpolateTemplateVars}}</a>';
+      var linkTemplate = '<a class="panel-title">{{panel.title || interpolateTemplateVars}}</a>';
       var moveAttributes = ' data-drag=true data-jqyoui-options="kbnJqUiDraggableOptions"'+
               ' jqyoui-draggable="{'+
                 'animate:false,'+
@@ -62,8 +62,6 @@ function (angular, $, _) {
             clearTimeout(timeout);
             timeout = null;
 
-            console.log('dismiss', time);
-
             if (time) {
               timeout = setTimeout(dismiss, time);
               return;
@@ -124,7 +122,7 @@ function (angular, $, _) {
             dismiss(2500);
           };
 
-          $link.click(showMenu);
+          elem.click(showMenu);
           $compile(elem.contents())($scope);
         }
       };
diff --git a/src/app/services/panelSrv.js b/src/app/services/panelSrv.js
index 7ee45027b2b..8840a78695f 100644
--- a/src/app/services/panelSrv.js
+++ b/src/app/services/panelSrv.js
@@ -10,7 +10,6 @@ function (angular, _) {
 
     this.init = function($scope) {
       if (!$scope.panel.span) { $scope.panel.span = 12; }
-      if (!$scope.panel.title) { $scope.panel.title = 'No title'; }
 
       var menu = [
         {
diff --git a/src/css/less/panel.less b/src/css/less/panel.less
index 902d245298e..7e103fc463a 100644
--- a/src/css/less/panel.less
+++ b/src/css/less/panel.less
@@ -15,6 +15,11 @@
   padding: 0px 10px 5px 10px;
 }
 
+.panel-title-container {
+  min-height: 5px;
+  cursor: pointer;
+}
+
 .panel-title {
   border: 0px;
   font-weight: bold;