diff --git a/CHANGELOG.md b/CHANGELOG.md
index 114b1528476..76654a22213 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# 4.2.0 (unreleased)
+
+# 4.0.0 (unreleased)
+
+### Bugfixes
+* **Server side PNG rendering**: Fixed issue with y-axis label rotation in phantomjs rendered images [#6924](https://github.com/grafana/grafana/issues/6924)
+* **Graph**: Fixed centering of y-axis label [#7099](https://github.com/grafana/grafana/issues/7099)
+* **Graph**: Fixed graph legend table mode and always visible scrollbar [#6828](https://github.com/grafana/grafana/issues/6828)
+
 # 4.1-beta1 (2016-12-21)
 
 ### Enhancements
diff --git a/public/sass/components/_panel_graph.scss b/public/sass/components/_panel_graph.scss
index f02a45a96ae..d23e62cb593 100644
--- a/public/sass/components/_panel_graph.scss
+++ b/public/sass/components/_panel_graph.scss
@@ -87,6 +87,7 @@
 .graph-legend-table {
   overflow-y: auto;
   overflow-x: hidden;
+  display: table;
 
   .graph-legend-series {
     display: table-row;