diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index ad9e4f251b..286cb7539a 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -557,7 +557,8 @@ AJAX.registerOnload('server_status_monitor.js', function() {
         }
 
         runtime.xmin = new Date().getTime() - server_time_diff - runtime.gridMaxPoints * monitorSettings.gridRefresh;
-        runtime.xmax = new Date().getTime() - server_time_diff + monitorSettings.gridRefresh;
+        // fixing chart shift towards left on refresh rate change
+        //runtime.xmax = new Date().getTime() - server_time_diff + monitorSettings.gridRefresh;
         runtime.refreshTimeout = setTimeout(refreshChartGrid, monitorSettings.gridRefresh);
 
         saveMonitor(); // Save settings
diff --git a/js/tbl_chart.js b/js/tbl_chart.js
index 23034a6a73..dc292fd3f9 100644
--- a/js/tbl_chart.js
+++ b/js/tbl_chart.js
@@ -266,7 +266,12 @@ function PMA_queryChart(data, columnNames, settings) {
                 label : settings.yaxisLabel
             }
         },
-        stackSeries : settings.stackSeries
+        stackSeries : settings.stackSeries,
+        highlighter: {
+            show: true,
+            showTooltip: true,
+            tooltipAxes: 'xy'
+        }
     };
 
     // create the chart
diff --git a/tbl_chart.php b/tbl_chart.php
index 32602852a8..4d0dd8fb2c 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -79,6 +79,7 @@ $scripts->addFile('jqplot/plugins/jqplot.categoryAxisRenderer.js');
 $scripts->addFile('jqplot/plugins/jqplot.dateAxisRenderer.js');
 $scripts->addFile('jqplot/plugins/jqplot.pointLabels.js');
 $scripts->addFile('jqplot/plugins/jqplot.pieRenderer.js');
+$scripts->addFile('jqplot/plugins/jqplot.highlighter.js');
 /* < IE 9 doesn't support canvas natively */
 if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) {
     $scripts->addFile('canvg/flashcanvas.js');