diff --git a/enum_editor.php b/enum_editor.php
index f7397ea0e..74ed09a28 100644
--- a/enum_editor.php
+++ b/enum_editor.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
@@ -18,7 +18,7 @@ require_once './libraries/header_meta_style.inc.php';
 <body>
     <form action="enum_editor.php" method="get">
         <div id="enum_editor_no_js">
-            <h3><?php echo __('Values for the column "' . urldecode($_GET['field']) . '"'); ?></h3>
+            <h3><?php printf(__('Values for the column "%s"'), htmlspecialchars($_GET['field'])); ?></h3>
             <p><?php echo __('Enter each value in a separate field, enclosed in single quotes. If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, precede it with a backslash (for example \'\\\\xyz\' or \'a\\\'b\').'); ?></p>
             <div id="values">
             <?php
@@ -72,4 +72,4 @@ require_once './libraries/header_meta_style.inc.php';
         </div>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 34e2c6d71..845f752f1 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -795,11 +795,11 @@ if ($action == 'tbl_create.php') {
 
 <div id="enum_editor">
 <a class="close_enum_editor">Close</a>
-<h3><?php echo __('Values for the column "' . (isset($row['Field']) ? urlencode($row['Field']) : "") . '"'); ?></h3>
+<h3><?php printf(__('Values for the column "%s"'), isset($row['Field']) ? htmlspecialchars($row['Field']) : ""); ?></h3>
 <p><?php echo __('Enter each value in a separate field. If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, precede it with a backslash (for example \'\\\\xyz\' or \'a\\\'b\').'); ?></p>
 <div id="values"></div>
 <p><a class="add_value">+ Add a new value</a></p>
 <input type="submit" value="Go" /> <a class="cancel_enum_editor">Cancel</a>
 </div>
 
-<div id="popup_background"></div>
\ No newline at end of file
+<div id="popup_background"></div>
