diff --git a/src/wp-admin/css/install.css b/src/wp-admin/css/install.css
index 27b023bb54..5667deb4a8 100644
--- a/src/wp-admin/css/install.css
+++ b/src/wp-admin/css/install.css
@@ -313,7 +313,7 @@ body.rtl,
 }
 
 body.language-chooser {
-	max-width: 450px;
+	max-width: 300px;
 }
 
 .language-chooser fieldset {
@@ -381,4 +381,33 @@ body.language-chooser {
 	border: 0;
 }
 
+.spinner {
+	background: url(../images/spinner.gif) no-repeat;
+	-webkit-background-size: 20px 20px;
+	background-size: 20px 20px;
+	visibility: hidden;
+	opacity: 0.7;
+	filter: alpha(opacity=70);
+	width: 20px;
+	height: 20px;
+	margin: 2px 5px 0;
+}
+
+.step .spinner {
+	display: inline-block;
+	margin-right: 15px;
+}
+
+/**
+ * HiDPI Displays
+ */
+@media print,
+  (-o-min-device-pixel-ratio: 5/4),
+  (-webkit-min-device-pixel-ratio: 1.25),
+  (min-resolution: 120dpi) {
+
+	.spinner {
+		background-image: url(../images/spinner-2x.gif);
+	}
+
 }
diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php
index cbec07fb13..b62ebfa4de 100644
--- a/src/wp-admin/includes/upgrade.php
+++ b/src/wp-admin/includes/upgrade.php
@@ -2179,7 +2179,7 @@ function wp_install_language_form( $languages ) {
 		echo '<label for="language_' . esc_attr( $language['language'] ) . '">' . esc_html( $language['native_name'] ) . "</label>\n";
 	}
 	echo "</fieldset>\n";
-	echo '<p class="step"><input type="submit" class="button button-primary button-hero" value="&raquo;" /></p>';
+	echo '<p class="step"><span class="spinner"></span><input type="submit" class="button button-primary button-hero" value="&raquo;" /></p>';
 }
 
 /**
diff --git a/src/wp-admin/js/language-chooser.js b/src/wp-admin/js/language-chooser.js
index f328db32a1..ab1c20394a 100644
--- a/src/wp-admin/js/language-chooser.js
+++ b/src/wp-admin/js/language-chooser.js
@@ -36,4 +36,8 @@
 		setTimeout( maybeRemoveFieldsetFocus, 50);
 	});
 
+	$('form').submit(function(){
+		$(this).find('.step .spinner').css('visibility','visible');
+	});
+
 })(jQuery);