diff --git a/js/ajax.js b/js/ajax.js
index 0ac45f9bdb..902eea3d4b 100644
--- a/js/ajax.js
+++ b/js/ajax.js
@@ -247,9 +247,11 @@ var AJAX = {
                     .not('#session_debug')
                     .remove();
                 // Replace #page_content with new content
-                $('#page_content').replaceWith(
-                    "<div id='page_content'>" + data.message + "</div>"
-                );
+                if(data.message && data.message.length > 0) {
+                    $('#page_content').replaceWith(
+                        "<div id='page_content'>" + data.message + "</div>"
+                    );
+                }
 
                 if (data._selflink) {
                     $('#selflink > a').attr('href', data._selflink);
diff --git a/tbl_chart.php b/tbl_chart.php
index 3b4acb6060..5031b63799 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -120,7 +120,7 @@ url_query = '<?php echo $url_query;?>';
 </script>
 <!-- Display Chart options -->
 <div id="div_view_options">
-<form method="post" id="tblchartform" action="tbl_chart.php">
+<form method="post" id="tblchartform" action="tbl_chart.php" class="ajax">
 <?php echo PMA_generate_common_hidden_inputs($url_params); ?>
 <fieldset>
     <legend><?php echo __('Display chart'); ?></legend>