diff --git a/src/app/panels/graph/legend.js b/src/app/panels/graph/legend.js
index 65a82760bf2..8c9cd3fad3f 100644
--- a/src/app/panels/graph/legend.js
+++ b/src/app/panels/graph/legend.js
@@ -56,7 +56,11 @@ function (angular, app, _, kbn, $) {
 
         function sortLegend(e) {
           var el = $(e.currentTarget);
+          var stat = el.data('stat');
 
+          if (stat !== panel.legend.sort) { panel.legend.sortDesc = null; }
+
+          // if already sort ascending, disable sorting
           if (panel.legend.sortDesc === false) {
             panel.legend.sort = null;
             panel.legend.sortDesc = null;
@@ -65,7 +69,7 @@ function (angular, app, _, kbn, $) {
           }
 
           panel.legend.sortDesc = !panel.legend.sortDesc;
-          panel.legend.sort = el.data('stat');
+          panel.legend.sort = stat;
           render();
         }
 
diff --git a/src/css/less/graph.less b/src/css/less/graph.less
index ad32e25c4ca..cb489aeb8b3 100644
--- a/src/css/less/graph.less
+++ b/src/css/less/graph.less
@@ -114,6 +114,7 @@
     font-weight: bold;
     color: @blue;
     font-size: 85%;
+    white-space: nowrap;
   }
 }