diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index 0386f24e8f..eefb376869 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -94,10 +94,18 @@ case 'editedcat':
 	if ( !current_user_can('manage_categories') )
 		wp_die(__('Cheatin’ uh?'));
 
+	$location = 'categories.php';
+	if ( $referer = wp_get_original_referer() ) {
+		if ( false !== strpos($referer, 'categories.php') )
+			$location = $referer;
+	}
+
 	if ( wp_update_category($_POST) )
-		wp_redirect('categories.php?message=3');
+		$location = add_query_arg('message', 3, $location);
 	else
-		wp_redirect('categories.php?message=5');
+		$location = add_query_arg('message', 5, $location);
+
+	wp_redirect($location);
 
 	exit;
 break;
diff --git a/wp-admin/edit-category-form.php b/wp-admin/edit-category-form.php
index 62888efddb..d2b58a74b1 100644
--- a/wp-admin/edit-category-form.php
+++ b/wp-admin/edit-category-form.php
@@ -61,7 +61,7 @@ _fill_empty_category($category);
 <?php echo $form ?>
 <input type="hidden" name="action" value="<?php echo $action ?>" />
 <input type="hidden" name="cat_ID" value="<?php echo $category->term_id ?>" />
-<?php wp_nonce_field($nonce_action); ?>
+<?php wp_original_referer_field(true, 'previous'); wp_nonce_field($nonce_action); ?>
 	<table class="form-table">
 		<tr class="form-field form-required">
 			<th scope="row" valign="top"><label for="cat_name"><?php _e('Category Name') ?></label></th>