diff --git a/src/wp-admin/js/theme.js b/src/wp-admin/js/theme.js
index 79fe3c8d86..6f4e378b4f 100644
--- a/src/wp-admin/js/theme.js
+++ b/src/wp-admin/js/theme.js
@@ -325,6 +325,7 @@ themes.Collection = Backbone.Collection.extend({
 		return $.ajax({
 			url: 'https://api.wordpress.org/themes/info/1.1/?callback=?',
 			dataType: 'jsonp',
+			timeout: 15000, // 15 seconds
 
 			// Request data
 			data: {
diff --git a/src/wp-admin/theme-install.php b/src/wp-admin/theme-install.php
index 6df165d545..77efdeb7cf 100644
--- a/src/wp-admin/theme-install.php
+++ b/src/wp-admin/theme-install.php
@@ -56,7 +56,7 @@ wp_localize_script( 'theme', '_wpThemeSettings', array(
 		'searchPlaceholder' => __( 'Search themes...' ), // placeholder (no ellipsis)
 		'upload' => __( 'Upload Theme' ),
 		'back'   => __( 'Back' ),
-		'error'  => ( 'There was a problem trying to load the themes. Please, try again.' ), // @todo improve
+		'error'  => sprintf( __( 'An unexpected error occurred and we can&#8127;t reach WordPress.org. If you continue to have problems, please try the <a href="%s">support forums</a>.' ), __( 'https://wordpress.org/support/' ) )
 	),
 	'installedThemes' => array_keys( $installed_themes ),
 	'browse' => array(