diff --git a/war/src/main/js/pluginSetupWizardGui.js b/war/src/main/js/pluginSetupWizardGui.js
index 4177cf4eca8c5b85a3b7dbd9bac293a225fdb1f8..94342188e213ff2e3cc3ec58ddb0373a3d0027eb 100644
--- a/war/src/main/js/pluginSetupWizardGui.js
+++ b/war/src/main/js/pluginSetupWizardGui.js
@@ -207,7 +207,7 @@ var createPluginSetupWizard = function(appendTarget) {
 				decorate($container);
 				
 				var $modalHeader = $container.find('.modal-header');
-				if($modalHeader.length > 0) {
+				if($modalHeader.length > 0 && $modalHeader.is('.closeable')) {
 					$modalHeader.prepend(
 						'<button type="button" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button>');
 				}
@@ -815,7 +815,7 @@ var createPluginSetupWizard = function(appendTarget) {
 		'.plugin-select-recommended': function() { selectedPluginNames = pluginManager.recommendedPluginNames(); refreshPluginSelectionPanel(); },
 		'.plugin-show-selected': toggleSelectedSearch,
 		'.select-category': selectCategory,
-		'.close': closeInstaller,
+		'.close': skipFirstUser,
 		'.resume-installation': resumeInstallation,
 		'.install-done-restart': restartJenkins,
 		'.save-first-user:not([disabled])': saveFirstUser,
diff --git a/war/src/main/js/templates/pluginSelectionPanel.hbs b/war/src/main/js/templates/pluginSelectionPanel.hbs
index b5d295b02521178ed9ff0a0337e23949db728b8c..ad1affa91e85cd82a29a78865ff87ced2d1f61bf 100644
--- a/war/src/main/js/templates/pluginSelectionPanel.hbs
+++ b/war/src/main/js/templates/pluginSelectionPanel.hbs
@@ -1,4 +1,4 @@
-<div class="modal-header">
+<div class="modal-header closeable">
 	<h4 class="modal-title">{{translations.installWizard_installCustom_title}}</h4>
 </div>
 <div class="modal-body plugin-selector">
diff --git a/war/src/main/js/templates/welcomePanel.hbs b/war/src/main/js/templates/welcomePanel.hbs
index 5aa57427563adfcfd06bee205973cf340a7933f0..ccc08b98bcc9baf0cac6b7dfde9aa9aa6ad16eba 100644
--- a/war/src/main/js/templates/welcomePanel.hbs
+++ b/war/src/main/js/templates/welcomePanel.hbs
@@ -1,4 +1,4 @@
-<div class="modal-header">
+<div class="modal-header closeable">
 	<h4 class="modal-title">{{translations.installWizard_welcomePanel_title}}</h4>
 </div>
 <div class="modal-body">