diff --git a/ChangeLog b/ChangeLog
index e03c9c6f5d..efd612a7cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,7 @@ phpMyAdmin - ChangeLog
 
 4.4.10.0 (not yet released)
 - bug #4950 Issues in database selection for replication
+- bug #4951 Trying to save chart as image crashes the browser
 
 4.4.9.0 (2015-06-04)
 - bug #4920 relation view doesn't list fields of table in other database
diff --git a/js/jqplot/jquery.jqplot.js b/js/jqplot/jquery.jqplot.js
index 49812b77fc..fc4f8b7406 100644
--- a/js/jqplot/jquery.jqplot.js
+++ b/js/jqplot/jquery.jqplot.js
@@ -9139,7 +9139,7 @@
 
             for (var i=0; i<wl; i++) {
                 w += words[i];
-                if (context.measureText(w).width > tagwidth) {
+                if (context.measureText(w).width > tagwidth && w.length > words[i].length) {
                     breaks.push(i);
                     w = '';
                     i--;