diff --git a/wp-admin/edit-category-form.php b/wp-admin/edit-category-form.php
index 60368c2f0a..aaf1c1353e 100644
--- a/wp-admin/edit-category-form.php
+++ b/wp-admin/edit-category-form.php
@@ -31,7 +31,7 @@ if ( ! empty($cat_ID) ) {
 		</tr>
 		<tr class="form-field">
 			<th scope="row" valign="top"><label for="category_nicename"><?php _e('Category Slug') ?></label></th>
-			<td><input name="category_nicename" id="category_nicename" type="text" value="<?php echo attribute_escape($category->slug); ?>" size="40" /><br />
+			<td><input name="category_nicename" id="category_nicename" type="text" value="<?php echo attribute_escape(rawurldecode($category->slug)); ?>" size="40" /><br />
             <?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></td>
 		</tr>
 		<tr class="form-field">
diff --git a/wp-admin/edit-link-category-form.php b/wp-admin/edit-link-category-form.php
index 67b0be1d10..ac664300c0 100644
--- a/wp-admin/edit-link-category-form.php
+++ b/wp-admin/edit-link-category-form.php
@@ -30,7 +30,7 @@ if ( ! empty($cat_ID) ) {
 		</tr>
 		<tr class="form-field">
 			<th scope="row" valign="top"><label for="slug"><?php _e('Category slug') ?></label></th>
-			<td><input name="slug" id="slug" type="text" value="<?php echo $category->slug; ?>" size="40" />
+			<td><input name="slug" id="slug" type="text" value="<?php echo rawurldecode($category->slug); ?>" size="40" />
             <?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></td>
 		</tr>
 		<tr class="form-field">
diff --git a/wp-admin/edit-tag-form.php b/wp-admin/edit-tag-form.php
index 62a8e2b8ff..063c4560a5 100644
--- a/wp-admin/edit-tag-form.php
+++ b/wp-admin/edit-tag-form.php
@@ -31,7 +31,7 @@ if ( ! empty($tag_ID) ) {
 		</tr>
 		<tr class="form-field">
 			<th scope="row" valign="top"><label for="slug"><?php _e('Tag slug') ?></label></th>
-			<td><input name="slug" id="slug" type="text" value="<?php echo attribute_escape($tag->slug); ?>" size="40" />
+			<td><input name="slug" id="slug" type="text" value="<?php echo attribute_escape(rawurldecode($tag->slug)); ?>" size="40" />
             <p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></td>
 		</tr>
 	</table>
diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index 99542fa8cf..b04463bd53 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -642,6 +642,10 @@ function get_sample_permalink_html($id, $new_title=null, $new_slug=null) {
 		return '';
 	}
 	$title = __('Click to edit this part of the permalink');
+
+	// make %-encoded international names readable and therefore editable
+	$post_name = rawurldecode($post_name);
+        
 	if (strlen($post_name) > 30) {
 		$post_name_abridged = substr($post_name, 0, 14). '&hellip;' . substr($post_name, -14);
 	} else {