diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
index 3929420898..07a247504a 100644
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -575,6 +575,9 @@ case 'add-tag' : // From Manage->Tags
 		$x->send();
 	}
 
+	if ( isset($_POST['screen']) )
+		set_current_screen($_POST['screen']);
+
 	$level = 0;
 	$tag_full_name = false;
 	$tag_full_name = $tag->name;
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index a4b48bc809..2624e4b28f 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -383,6 +383,7 @@ if ( current_user_can($tax->cap->edit_terms) ) {
 <h3><?php echo $tax->labels->add_new_item; ?></h3>
 <form id="addtag" method="post" action="edit-tags.php" class="validate">
 <input type="hidden" name="action" value="add-tag" />
+<input type="hidden" name="screen" value="<?php echo esc_attr($current_screen->id); ?>" />
 <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
 <?php wp_nonce_field('add-tag'); ?>
 
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 2212493304..687aa3777b 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -3909,8 +3909,15 @@ function set_current_screen( $id =  '' ) {
 		$current_screen = str_replace('-add', '', $current_screen);
 		$current_screen = array('id' => $current_screen, 'base' => $current_screen);
 	} else {
-		if ( false !== strpos($id, '-') )
+		$id = sanitize_key($id);
+		if ( false !== strpos($id, '-') ) {
 			list( $id, $typenow ) = explode('-', $id, 2);
+			if ( is_taxonomy($typenow) ) {
+				$id = 'edit-tags';
+				$taxnow = $typenow;
+				$typenow = '';
+			}
+		}
 		$current_screen = array('id' => $id, 'base' => $id);
 	}