diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index 1130dbdfc9..b8dfebcfaa 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -18,7 +18,14 @@ if ( isset($_GET['deleteit']) && isset($_GET['delete']) ) {
 		wp_delete_term($cat_ID, 'link_category');
 	}
 
-	wp_redirect('edit-link-categories.php?message=6');
+	$location = 'edit-link-categories.php';
+	if ( $referer = wp_get_referer() ) {
+		if ( false !== strpos($referer, 'edit-link-categories.php') )
+			$location = $referer;
+	}
+
+	$location = add_query_arg('message', 6, $location);
+	wp_redirect($location);
 	exit();
 } elseif ( !empty($_GET['_wp_http_referer']) ) {
 	 wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI'])));
diff --git a/wp-admin/edit-link-category-form.php b/wp-admin/edit-link-category-form.php
index 396550a9f8..67b0be1d10 100644
--- a/wp-admin/edit-link-category-form.php
+++ b/wp-admin/edit-link-category-form.php
@@ -22,7 +22,7 @@ if ( ! empty($cat_ID) ) {
 <?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="name"><?php _e('Category name') ?></label></th>
diff --git a/wp-admin/link-category.php b/wp-admin/link-category.php
index 3af8887522..a67cf2b6a7 100644
--- a/wp-admin/link-category.php
+++ b/wp-admin/link-category.php
@@ -35,7 +35,15 @@ case 'delete':
 
 	wp_delete_term($cat_ID, 'link_category');
 
-	wp_redirect('edit-link-categories.php?message=2');
+	$location = 'edit-link-categories.php';
+	if ( $referer = wp_get_original_referer() ) {
+		if ( false !== strpos($referer, 'edit-link-categories.php') )
+			$location = $referer;
+	}
+
+	$location = add_query_arg('message', 2, $location);
+
+	wp_redirect($location);
 	exit;
 
 break;
@@ -59,11 +67,18 @@ case 'editedcat':
 	if ( !current_user_can('manage_categories') )
 		wp_die(__('Cheatin&#8217; uh?'));
 
-	if ( wp_update_term($cat_ID, 'link_category', $_POST) )
-		wp_redirect('edit-link-categories.php?message=3');
-	else
-		wp_redirect('edit-link-categories.php?message=5');
+	$location = 'edit-link-categories.php';
+	if ( $referer = wp_get_original_referer() ) {
+		if ( false !== strpos($referer, 'edit-link-categories.php') )
+			$location = $referer;
+	}
 
+	if ( wp_update_term($cat_ID, 'link_category', $_POST) )
+		$location = add_query_arg('message', 3, $location);
+	else
+		$location = add_query_arg('message', 5, $location);
+
+	wp_redirect($location);
 	exit;
 break;
 }