diff --git a/tbl_operations.php b/tbl_operations.php
index 5452dc58b..958120983 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -329,7 +329,7 @@ if (strstr($show_comment, '; InnoDB free') === false) {
     <tr><td><?php echo $strTableComments; ?></td>
         <td><input type="text" name="comment" maxlength="60" size="30"
                 value="<?php echo htmlspecialchars($comment); ?>" onfocus="this.select()" />
-            <input type="hidden" name="prev_comment" value="<?php echo urlencode($comment); ?>" />
+            <input type="hidden" name="prev_comment" value="<?php echo htmlspecialchars($comment); ?>" />
         </td>
     </tr>
 
diff --git a/tbl_replace.php b/tbl_replace.php
index 5b7298a58..a2f96f7bb 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -25,7 +25,6 @@
  * @uses    PMA_securePath()
  * @uses    PMA_sendHeaderLocation()
  * @uses    str_replace()
- * @uses    urlencode()
  * @uses    count()
  * @uses    file_exists()
  * @uses    strlen()