diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index 5cca8f2aca..39157c7be2 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -302,7 +302,7 @@ if ( $page_links )
 </script>
 
 <?php
-inline_edit_term_row('category');
+inline_edit_term_row('categories');
 
 break;
 }
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index ad29a480bb..6ff4790862 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -234,5 +234,5 @@ if ( $page_links )
 /* ]]> */
 </script>
 
-<?php inline_edit_term_row('link-category'); ?>
+<?php inline_edit_term_row('edit-link-categories'); ?>
 <?php include('admin-footer.php'); ?>
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 16f8870504..c957eea779 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -292,7 +292,7 @@ else
 /* ]]> */
 </script>
 
-<?php inline_edit_term_row('tag'); ?>
+<?php inline_edit_term_row('edit-tags'); ?>
 
 <?php
 break;
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 4de570e3e4..0eb89a9f71 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -203,8 +203,8 @@ function inline_edit_term_row($type) {
 	if ( ! current_user_can( 'manage_categories' ) )
 		return;
 
-	$is_tag = $type == 'tag';
-	$columns = $is_tag ? get_column_headers('tag') : get_column_headers('category');
+	$is_tag = $type == 'edit-tags';
+	$columns = get_column_headers($type);
 	$hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns($type) ) );
 	$col_count = count($columns) - count($hidden);
 	?>
@@ -922,13 +922,16 @@ function inline_edit_row( $type ) {
 	global $current_user, $mode;
 
 	$is_page = 'page' == $type;
-	if ( $is_page )
+	if ( $is_page ) {
+		$screen = 'edit';
 		$post = get_default_page_to_edit();
-	else
+	} else {
+		$screen = 'edit-pages';
 		$post = get_default_post_to_edit();
+	}
 
 	$columns = $is_page ? wp_manage_pages_columns() : wp_manage_posts_columns();
-	$hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns($type) ) );
+	$hidden = array_intersect( array_keys( $columns ), array_filter( get_hidden_columns($screen) ) );
 	$col_count = count($columns) - count($hidden);
 	$m = ( isset($mode) && 'excerpt' == $mode ) ? 'excerpt' : 'list';
 	$can_publish = current_user_can("publish_{$type}s");