diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index 8ff48770b2..fa59874a0d 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -1012,7 +1012,17 @@ class PMA_Util
                 $sql_query = '';
             }
         }
-
+        
+        if (isset($GLOBALS['db']) && isset($GLOBALS['table'])){
+           // Parse and analyze the query
+           $analyzed_sql_results = PMA_SQP_getParserAnalyzeMap(
+                   $sql_query, $GLOBALS['db']);
+        
+           // Synchronize message(query) with table
+           PMA_handleSortOrder($GLOBALS['db'], $GLOBALS['table'], 
+                   $analyzed_sql_results, $sql_query);
+        }
+        
         if (isset($GLOBALS['using_bookmark_message'])) {
             $retval .= $GLOBALS['using_bookmark_message']->getDisplay();
             unset($GLOBALS['using_bookmark_message']);
diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php
index f3ee83de94..cfdd42ba75 100644
--- a/libraries/sql.lib.php
+++ b/libraries/sql.lib.php
@@ -227,7 +227,8 @@ function PMA_getTableHtmlForMultipleQueries(
 function PMA_handleSortOrder($db, $table, &$analyzed_sql_results, &$full_sql_query)
 {
     $pmatable = new PMA_Table($table, $db);
-    if (empty($analyzed_sql_results['analyzed_sql'][0]['order_by_clause'])) {
+    if (empty($analyzed_sql_results['analyzed_sql'][0]['order_by_clause'])
+            && isset($GLOBALS['default_query']) && $GLOBALS['default_query']) {
         $sorted_col = $pmatable->getUiProp(PMA_Table::PROP_SORTED_COLUMN);
         if ($sorted_col) {
             //remove the tablename from retrieved preference
@@ -1170,6 +1171,7 @@ function PMA_appendLimitClause($full_sql_query, $analyzed_sql, $display_query)
  */
 function PMA_getDefaultSqlQueryForBrowse($db, $table)
 {
+    $GLOBALS['default_query'] = true;
     include_once 'libraries/bookmark.lib.php';
     $book_sql_query = PMA_Bookmark_get(
         $db,