diff --git a/core/templates/installation.php b/core/templates/installation.php
index 342383fdb2..ef20d8672e 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -61,9 +61,14 @@
 		</p>
 	</fieldset>
 
+	<?php if(!$_['directoryIsSet'] OR !$_['dbIsSet']): ?>
+	<fieldset id="advancedHeader">
+		<legend><a id="showAdvanced"><?php p($l->t( 'Advanced' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend>
+	</fieldset>
+	<?php endif; ?>
+
 	<?php if(!$_['directoryIsSet']): ?>
 	<fieldset id="datadirField">
-		<legend><a id="showAdvanced"><?php p($l->t( 'Advanced' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend>
 		<div id="datadirContent">
 			<label for="directory"><?php p($l->t( 'Data folder' )); ?></label>
 			<input type="text" name="directory" id="directory"