diff --git a/CHANGELOG.md b/CHANGELOG.md
index 682904a08d8..a7b4bbd366a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 
 **Fixes**
 - [Issue #925](https://github.com/grafana/grafana/issues/925). Graph: bar width calculation fix for some edge cases (bars would render on top of each other)
+- [Issue #505](https://github.com/grafana/grafana/issues/505). Graph: fix for second y axis tick unit labels wrapping on the next line
 
 =======
 # 1.8.1 (2014-09-30)
diff --git a/src/vendor/jquery/jquery.flot.js b/src/vendor/jquery/jquery.flot.js
index 87a1b17c742..dc9e3677851 100644
--- a/src/vendor/jquery/jquery.flot.js
+++ b/src/vendor/jquery/jquery.flot.js
@@ -1416,7 +1416,8 @@ Licensed under the MIT license.
 
                 var info = surface.getTextInfo(layer, t.label, font, null, maxWidth);
 
-                labelWidth = Math.max(labelWidth, info.width);
+                /// Grafana fix, add +1 to label width
+                labelWidth = Math.max(labelWidth, info.width + 1);
                 labelHeight = Math.max(labelHeight, info.height);
             }