diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Custom.html b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Custom.html
index 2a50e95b67146eaeddf78d94a5b37946a78ce48e..7b9d137192abc0d0f80321675da21fcac5bcefd9 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Custom.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Custom.html
@@ -33,7 +33,8 @@
 						type="input"
 						name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
 						value="{configurationValue}"
-						class="form-control"
+						class="form-control t3js-custom-preset"
+						data-radio="t3-install-tool-configuration-context-custom"
 					/>
 				</div>
 			</div>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/Custom.html b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/Custom.html
index 133d5063b78c1802300be63b2cad7e3fe1a037a4..deda64cd5bd548346444bde13a886145216a2e46 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/Custom.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/Custom.html
@@ -33,7 +33,8 @@
 						type="input"
 						name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
 						value="{configurationValue}"
-						class="form-control"
+						class="form-control t3js-custom-preset"
+						data-radio="t3-install-tool-configuration-image-custom"
 					/>
 				</div>
 			</div>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Mail/Custom.html b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Mail/Custom.html
index 28fe86e1b0194e33c88c41d9b5967547b0e43008..9531c8256289dee8bc3932bd193905c50cdd60d1 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Mail/Custom.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Mail/Custom.html
@@ -4,13 +4,13 @@
 			<input
 				type="radio"
 				class="t3-install-tool-configuration-radio"
-				id="t3-install-tool-configuration-charset-custom"
+				id="t3-install-tool-configuration-mail-custom"
 				name="install[values][{feature.name}][enable]"
 				value="{preset.name}"
 				{f:if(condition:'{preset.isActive}', then:'checked="checked"')}
 			/>
 			<label
-				for="t3-install-tool-configuration-charset-custom"
+				for="t3-install-tool-configuration-mail-custom"
 				class="t3-install-tool-configuration-radio-label"
 				>
 				<strong>
@@ -33,7 +33,8 @@
 						type="input"
 						name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
 						value="{configurationValue}"
-						class="form-control"
+						class="form-control t3js-custom-preset"
+						data-radio="t3-install-tool-configuration-mail-custom"
 						/>
 				</div>
 			</div>
diff --git a/typo3/sysext/install/Resources/Public/JavaScript/Install.js b/typo3/sysext/install/Resources/Public/JavaScript/Install.js
index bfac527c13221905ae9327842503fa18847b1553..aad6583dbcfba9a3c889a776922501aee531ed63 100644
--- a/typo3/sysext/install/Resources/Public/JavaScript/Install.js
+++ b/typo3/sysext/install/Resources/Public/JavaScript/Install.js
@@ -675,4 +675,9 @@ $(function() {
 			TYPO3.Install.Scrolling.handleButtonScrolling();
 		}, 50);
 	});
+
+	// automatically select the custom preset if a value in one of its input fields is changed
+	$('.t3js-custom-preset').on('change', function () {
+		$('#' + $(this).data('radio')).prop('checked', true);
+	});
 });