diff --git wp-admin/includes/class-wp-themes-list-table.php wp-admin/includes/class-wp-themes-list-table.php
index 97ae61c..ceab971 100644
--- wp-admin/includes/class-wp-themes-list-table.php
+++ wp-admin/includes/class-wp-themes-list-table.php
@@ -114,6 +114,7 @@ class WP_Themes_List_Table extends WP_List_Table {
 	function display_rows() {
 		$themes = $this->items;
 		$theme_names = array_keys( $themes );
+		$page = $this->get_pagenum();
 		natcasesort( $theme_names );
 
 		$table = array();
@@ -154,7 +155,16 @@ foreach ( $cols as $col => $theme_name ) {
 	$preview_text = esc_attr( sprintf( __( 'Preview of “%s”' ), $title ) );
 	$tags = $themes[$theme_name]['Tags'];
 	$thickbox_class = 'thickbox thickbox-preview';
-	$activate_link = wp_nonce_url( "themes.php?action=activate&template=".urlencode( $template )."&stylesheet=".urlencode( $stylesheet ), 'switch-theme_' . $template );
+	
+	$activate_link_args = array(
+		'action'     => 'activate',
+		'template'   => urlencode( $template ),
+		'stylesheet' => urlencode( $stylesheet ),
+	);
+	if ( $page > 1 )
+		$activate_link_args['paged'] = $page;
+
+	$activate_link = wp_nonce_url( add_query_arg( $activate_link_args, 'themes.php' ), "switch-theme_{$template}" );
 	$activate_text = esc_attr( sprintf( __( 'Activate “%s”' ), $title ) );
 	$actions = array();
 	$actions[] = '<a href="' . $activate_link .  '" class="activatelink" title="' . $activate_text . '">' . __( 'Activate' ) . '</a>';
diff --git wp-admin/themes.php wp-admin/themes.php
index ea36c4b..a8ac3e8 100644
--- wp-admin/themes.php
+++ wp-admin/themes.php
@@ -18,14 +18,16 @@ if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) {
 	if ( 'activate' == $_GET['action'] ) {
 		check_admin_referer('switch-theme_' . $_GET['template']);
 		switch_theme($_GET['template'], $_GET['stylesheet']);
-		wp_redirect( admin_url('themes.php?activated=true') );
+		$sendback = $wp_list_table->add_query_args( admin_url( 'themes.php?activated=true' ) );
+		wp_redirect( $sendback );
 		exit;
 	} elseif ( 'delete' == $_GET['action'] ) {
 		check_admin_referer('delete-theme_' . $_GET['template']);
 		if ( !current_user_can('delete_themes') )
 			wp_die( __( 'Cheatin&#8217; uh?' ) );
 		delete_theme($_GET['template']);
-		wp_redirect( admin_url('themes.php?deleted=true') );
+		$sendback = $wp_list_table->add_query_args( admin_url( 'themes.php?deleted=true' ) );
+		wp_redirect( $sendback );
 		exit;
 	}
 }