Index: wp-admin/edit-comments.php
--- wp-admin/edit-comments.php Base (BASE)
+++ wp-admin/edit-comments.php Locally Modified (Based On LOCAL)
@@ -101,12 +101,6 @@

 $wp_list_table->prepare_items();

-$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-if ( $pagenum > $total_pages && $total_pages > 0 ) {
-	wp_redirect( add_query_arg( 'paged', $total_pages ) );
-	exit;
-}
-
 wp_enqueue_script('admin-comments');
 enqueue_comment_hotkeys_js();

Index: wp-admin/edit.php
--- wp-admin/edit.php Base (BASE)
+++ wp-admin/edit.php Locally Modified (Based On LOCAL)
@@ -142,12 +142,6 @@

 $wp_list_table->prepare_items();

-$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-if ( $pagenum > $total_pages && $total_pages > 0 ) {
-	wp_redirect( add_query_arg( 'paged', $total_pages ) );
-	exit;
-}
-
 wp_enqueue_script('inline-edit-post');

 $title = $post_type_object->labels->name;
Index: wp-admin/includes/class-wp-list-table.php
--- wp-admin/includes/class-wp-list-table.php Base (BASE)
+++ wp-admin/includes/class-wp-list-table.php Locally Modified (Based On LOCAL)
@@ -138,7 +138,13 @@

 		if ( !$args['total_pages'] && $args['per_page'] > 0 )
 			$args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
-
+
+		// redirect if page number is invalid and headers are not already sent
+		if ( ! headers_sent() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) && $args['total_pages'] > 0 && $this->get_pagenum() > $args['total_pages'] ) {
+			wp_redirect( add_query_arg( 'paged', $args['total_pages'] ) );
+			exit;
+		}
+
 		$this->_pagination_args = $args;
 	}

Index: wp-admin/network/sites.php
--- wp-admin/network/sites.php Base (BASE)
+++ wp-admin/network/sites.php Locally Modified (Based On LOCAL)
@@ -88,12 +88,6 @@

 $wp_list_table->prepare_items();

-$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-if ( $pagenum > $total_pages && $total_pages > 0 ) {
-	wp_redirect( add_query_arg( 'paged', $total_pages ) );
-	exit;
-}
-
 require_once( '../admin-header.php' );
 ?>

Index: wp-admin/network/themes.php
--- wp-admin/network/themes.php Base (BASE)
+++ wp-admin/network/themes.php Locally Modified (Based On LOCAL)
@@ -171,12 +171,6 @@

 $wp_list_table->prepare_items();

-$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-if ( $pagenum > $total_pages && $total_pages > 0 ) {
-	wp_redirect( add_query_arg( 'paged', $total_pages ) );
-	exit;
-}
-
 add_thickbox();

 add_screen_option( 'per_page', array('label' => _x( 'Themes', 'themes per page (screen options)' )) );
Index: wp-admin/plugin-install.php
--- wp-admin/plugin-install.php Base (BASE)
+++ wp-admin/plugin-install.php Locally Modified (Based On LOCAL)
@@ -23,11 +23,6 @@
 $wp_list_table = _get_list_table('WP_Plugin_Install_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
 $wp_list_table->prepare_items();
-$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-if ( $pagenum > $total_pages && $total_pages > 0 ) {
-	wp_redirect( add_query_arg( 'paged', $total_pages ) );
-	exit;
-}

 $title = __('Install Plugins');
 $parent_file = 'plugins.php';
Index: wp-admin/plugins.php
--- wp-admin/plugins.php Base (BASE)
+++ wp-admin/plugins.php Locally Modified (Based On LOCAL)
@@ -313,12 +313,6 @@

 $wp_list_table->prepare_items();

-$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-if ( $pagenum > $total_pages && $total_pages > 0 ) {
-	wp_redirect( add_query_arg( 'paged', $total_pages ) );
-	exit;
-}
-
 wp_enqueue_script('plugin-install');
 add_thickbox();

Index: wp-admin/theme-install.php
--- wp-admin/theme-install.php Base (BASE)
+++ wp-admin/theme-install.php Locally Modified (Based On LOCAL)
@@ -23,11 +23,6 @@
 $wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
 $wp_list_table->prepare_items();
-$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-if ( $pagenum > $total_pages && $total_pages > 0 ) {
-	wp_redirect( add_query_arg( 'paged', $total_pages ) );
-	exit;
-}

 $title = __('Install Themes');
 $parent_file = 'themes.php';
Index: wp-admin/upload.php
--- wp-admin/upload.php Base (BASE)
+++ wp-admin/upload.php Locally Modified (Based On LOCAL)
@@ -130,12 +130,6 @@

 $wp_list_table->prepare_items();

-$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-if ( $pagenum > $total_pages && $total_pages > 0 ) {
-	wp_redirect( add_query_arg( 'paged', $total_pages ) );
-	exit;
-}
-
 $title = __('Media Library');
 $parent_file = 'upload.php';

