diff --git a/public/app/plugins/app/testdata/dashboards/graph_last_1h.json b/public/app/plugins/app/testdata/dashboards/graph_last_1h.json
index 7c5723b558a..c56d9e9216f 100644
--- a/public/app/plugins/app/testdata/dashboards/graph_last_1h.json
+++ b/public/app/plugins/app/testdata/dashboards/graph_last_1h.json
@@ -8,7 +8,7 @@
   "hideControls": false,
   "links": [],
   "refresh": false,
-  "revision": 7,
+  "revision": 8,
   "rows": [
     {
       "collapse": false,
@@ -850,6 +850,90 @@
       "title": "Dashboard Row",
       "titleSize": "h6"
     },
+    {
+      "collapse": false,
+      "height": 250,
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "datasource": "Grafana TestData",
+          "decimals": 3,
+          "fill": 1,
+          "id": 20,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "max": true,
+            "min": true,
+            "show": true,
+            "total": true,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "span": 12,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "refId": "A",
+              "scenarioId": "csv_metric_values",
+              "stringInput": "1,20,90,30,5,0",
+              "target": ""
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Legend Table Single Series Should Take Minium Height",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ]
+        }
+      ],
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Dashboard Row",
+      "titleSize": "h6"
+    },
     {
       "collapse": false,
       "height": 250,
@@ -1360,5 +1444,5 @@
   },
   "timezone": "browser",
   "title": "TestData - Graph Panel Last 1h",
-  "version": 6
+  "version": 2
 }
diff --git a/public/app/plugins/app/testdata/plugin.json b/public/app/plugins/app/testdata/plugin.json
index 629e6248336..1d6264c54c1 100644
--- a/public/app/plugins/app/testdata/plugin.json
+++ b/public/app/plugins/app/testdata/plugin.json
@@ -9,7 +9,7 @@
       "name": "Grafana Project",
       "url": "http://grafana.org"
     },
-    "version": "1.0.16",
+    "version": "1.0.17",
     "updated": "2016-09-26"
   },
 
diff --git a/public/app/plugins/panel/graph/legend.js b/public/app/plugins/panel/graph/legend.js
index 5b7ba6ec131..cf652950485 100644
--- a/public/app/plugins/panel/graph/legend.js
+++ b/public/app/plugins/panel/graph/legend.js
@@ -198,7 +198,7 @@ function (angular, _, $) {
 
             var topPadding = 6;
             var tbodyElem = $('<tbody></tbody>');
-            tbodyElem.css("height", maxHeight - topPadding);
+            tbodyElem.css("max-height", maxHeight - topPadding);
             tbodyElem.append(tableHeaderElem);
             tbodyElem.append(seriesElements);
             $container.append(tbodyElem);