diff --git a/CHANGELOG.md b/CHANGELOG.md
index 555d0ebe89d..584f2e12492 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - [Issue #1136](https://github.com/grafana/grafana/issues/1136). Graph: Fix to legend value Max and negative values
 - [Issue #1150](https://github.com/grafana/grafana/issues/1150). SinglestatPanel: Fixed absolute drilldown link issue
 - [Issue #1123](https://github.com/grafana/grafana/issues/1123). Firefox: Workaround for Firefox bug, casued input text fields to not be selectable and not have placeable cursor
+- [Issue #1108](https://github.com/grafana/grafana/issues/1108). Graph: Fix for tooltip series order when series draw order was changed with zindex property
 
 # 1.9.0-rc1 (2014-11-17)
 
diff --git a/src/app/panels/graph/graph.js b/src/app/panels/graph/graph.js
index 837196660a6..485d64d76ae 100755
--- a/src/app/panels/graph/graph.js
+++ b/src/app/panels/graph/graph.js
@@ -26,6 +26,7 @@ function (angular, $, kbn, moment, _, GraphTooltip) {
       link: function(scope, elem) {
         var dashboard = scope.dashboard;
         var data, annotations;
+        var sortedSeries;
         var legendSideLastValue = null;
         scope.crosshairEmiter = false;
 
@@ -204,7 +205,7 @@ function (angular, $, kbn, moment, _, GraphTooltip) {
           addAnnotations(options);
           configureAxisOptions(data, options);
 
-          var sortedSeries = _.sortBy(data, function(series) { return series.zindex; });
+          sortedSeries = _.sortBy(data, function(series) { return series.zindex; });
 
           function callPlot() {
             try {
@@ -430,7 +431,7 @@ function (angular, $, kbn, moment, _, GraphTooltip) {
         }
 
         new GraphTooltip(elem, dashboard, scope, function() {
-          return data;
+          return sortedSeries;
         });
 
         elem.bind("plotselected", function (event, ranges) {