diff --git a/ChangeLog b/ChangeLog
index 538ce602d..2fadc2ff9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -65,6 +65,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + [lang] Brazilian-Portuguese update, thanks to Airon Luis Pereira
 + [gui] Insert/Edit: no longer display the Go button each 15 lines 
   but just at the end of a row
++ [gui] Query window: use verbose server name if any 
 
 2.10.2.0 (not yet released)
 
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 3c7e53331..8ad829901 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -221,8 +221,8 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
     if (! strlen($GLOBALS['db'])) {
         // prepare for server related
         $legend = sprintf($GLOBALS['strRunSQLQueryOnServer'],
-            htmlspecialchars(
-                $GLOBALS['cfg']['Servers'][$GLOBALS['server']]['host']));
+            '"' . htmlspecialchars(
+                ! empty($GLOBALS['cfg']['Servers'][$GLOBALS['server']]['verbose']) ? $GLOBALS['cfg']['Servers'][$GLOBALS['server']]['verbose'] : $GLOBALS['cfg']['Servers'][$GLOBALS['server']]['host']) . '"');
     } elseif (! strlen($GLOBALS['table'])) {
         // prepare for db related
         $db     = $GLOBALS['db'];