diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index c093fea83a..9da93e2e39 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -1201,6 +1201,19 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             settings.axes.yaxis.tickOptions = {
                 formatter: $.jqplot.byteFormatter(1) // KiB
             };
+        } else if (settings.title === PMA_messages.strQuestions
+            || settings.title === PMA_messages.strConnections
+        ) {
+            settings.axes.yaxis.tickOptions = {
+                formatter: function(format, val) {
+                    if (Math.abs(val) >= 1000000)
+                        return $.jqplot.sprintf("%.3g M", val/1000000);
+                    else if (Math.abs(val) >= 1000)
+                        return $.jqplot.sprintf("%.3g k", val/1000);
+                    else
+                        return $.jqplot.sprintf("%d", val);
+                }
+            };
         }
 
         settings.series = chartObj.series;
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 7c903aed0a..dfbd04f0aa 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -2811,3 +2811,9 @@ body .ui-widget {
     color: #235A81;
 }
 
+/* over-riding jqplot-yaxis class */
+.jqplot-yaxis {
+    left:0px !important;
+    min-width:25px;
+    width:auto;
+}