diff --git a/ChangeLog b/ChangeLog
index 6ab596d6d..0123cfe5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+2006-11-26 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_properties_structure.php: bug #1602335, browse distinct values
+      and name containing a quote
+
 2006-11-19 Michal Čihař  <michal@cihar.com>
     * libraries/unzip.lib.php: Fix check for encrypted file (bug #1596304).
 
diff --git a/tbl_properties_structure.php b/tbl_properties_structure.php
index 589c71584..186e4b8ef 100644
--- a/tbl_properties_structure.php
+++ b/tbl_properties_structure.php
@@ -366,7 +366,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
     <td nowrap="nowrap"><?php if (isset($row['Default'])) { echo $row['Default']; } ?></td>
     <td nowrap="nowrap"><?php echo $row['Extra']; ?></td>
     <td align="center">
-        <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('SELECT COUNT(*) AS `' . $strRows . '`, `' . $row['Field'] . '` FROM `' . $table . '` GROUP BY `' . $row['Field'] . '` ORDER BY `' . $row['Field'] . '`'); ?>">
+        <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('SELECT COUNT(*) AS ' . PMA_backquote($strRows) . ', ' . PMA_backquote($row['Field']) . ' FROM ' . PMA_backquote($table) . ' GROUP BY ' . PMA_backquote($row['Field']) . ' ORDER BY ' . PMA_backquote($row['Field']) . ''); ?>">
             <?php echo $titles['BrowseDistinctValues']; ?></a>
     </td>
     <?php if (! $tbl_is_view && ! $db_is_information_schema) { ?>