diff --git a/core/css/styles.css b/core/css/styles.css
index df4db4d745..1371de91f3 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -36,7 +36,9 @@ body {
 	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */
 }
 
-
+.float-spinner {
+	height: 32px;
+}
 
 #nojavascript {
 	position: fixed;
diff --git a/core/js/setup.js b/core/js/setup.js
index e65b795646..95237165b4 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -51,6 +51,9 @@ $(document).ready(function() {
 		// Save form parameters
 		var post = $(this).serializeArray();
 
+		// Show spinner while finishing setup
+		$('.float-spinner').show(250);
+
 		// Disable inputs
 		$(':submit', this).attr('disabled','disabled').val($(':submit', this).data('finishing'));
 		$('input', this).addClass('ui-state-disabled').attr('disabled','disabled');
@@ -91,6 +94,7 @@ $(document).ready(function() {
 		$('#datadirContent').hide(250);
 		$('#databaseBackend').hide(250);
 		$('#databaseField').hide(250);
+		$('.float-spinner').hide(250);
 	}
 
 	$('#adminpass').strengthify({
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 4e9cde205d..f8311fed00 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -145,6 +145,8 @@ script('core', [
 		</fieldset>
 		<?php endif; ?>
 	<?php endif; ?>
+	
+	<div class="icon-loading-dark float-spinner">&nbsp;</div>
 
 	<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
 		<fieldset id="sqliteInformation" class="warning">