diff --git a/ChangeLog b/ChangeLog
index 55cbb7b39..9e4dd19f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -125,6 +125,7 @@
   thanks to garas - garas
 - bug #3123433 [interface] Avoid double escaping of MySQL errors.
 - bug #3119874 [interface] Show integers without decimals on status page.
+- bug #3119882 [interface] Display query chart on demand.
 
 3.3.9.0 (not yet released)
 - bug [doc] Fix references to MySQL doc
diff --git a/server_status.php b/server_status.php
index de689657f..47649ac09 100644
--- a/server_status.php
+++ b/server_status.php
@@ -603,7 +603,7 @@ foreach ($sections as $section_name => $section) {
 
 <hr class="clearfloat" />
 
-<h3><?php echo
+<h3 id="serverstatusqueries"><?php echo
     sprintf(__('<b>Query statistics</b>: Since its startup, %s queries have been sent to the server.'),
         PMA_formatNumber($server_status['Questions'], 0)); ?></h3>
 
@@ -702,10 +702,20 @@ foreach ($used_queries as $name => $value) {
     <div class="clearfloat"></div>
 </div>
 
-<div>    
-    <?php
-    echo PMA_chart_status($used_queries);
-    ?>
+<div id="serverstatusquerieschart">
+<?php
+	if (empty($_REQUEST["query_chart"])) {
+		echo '<a href="' . $PMA_PHP_SELF . '?' . $url_query . '&amp;query_chart=1#serverstatusqueries"'
+			.'title="' . __('Show query chart') . '">'
+			. __('Show query chart') . '</a>';
+	} else {
+		echo PMA_chart_status($used_queries);
+		echo '<a href="' . $PMA_PHP_SELF . '?' . $url_query . '#serverstatusqueries"'
+		.'title="' . __('Hide query chart') . '">'
+		. __('Hide query chart') . '</a>';
+	}
+	PMA_Message::warning(__('Note: Generating the query chart can take a long time.'))->display();
+?>
 </div>
 
 <div id="serverstatussection">