diff --git a/wp-admin/includes/class-wp-themes-list-table.php b/wp-admin/includes/class-wp-themes-list-table.php
index 91553dbf6e..fecddfd50d 100644
--- a/wp-admin/includes/class-wp-themes-list-table.php
+++ b/wp-admin/includes/class-wp-themes-list-table.php
@@ -42,7 +42,7 @@ class WP_Themes_List_Table extends WP_List_Table {
 		unset( $themes[ get_option( 'stylesheet' ) ] );
 		WP_Theme::sort_by_name( $themes );
 
-		$per_page = 999;
+		$per_page = 36;
 		$page = $this->get_pagenum();
 
 		$start = ( $page - 1 ) * $per_page;