diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Maintenance/DatabaseAnalyzer.html b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Maintenance/DatabaseAnalyzer.html
index afe987b4a4a4de53323c624dfab6c894c16c17ab..2f8035ebbe22ec66f9e000a46e1f303ecff014ea 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Maintenance/DatabaseAnalyzer.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Tool/Maintenance/DatabaseAnalyzer.html
@@ -45,13 +45,14 @@
 <button
     class="btn btn-default t3js-databaseAnalyzer-analyze"
     type="button"
+    disabled
 >
     Run database compare again
 </button>
 <button
     class="btn btn-default t3js-databaseAnalyzer-execute"
     type="button"
-    style="display:none;"
+    disabled
 >
     Apply selected changes
 </button>
diff --git a/typo3/sysext/install/Resources/Public/JavaScript/Modules/DatabaseAnalyzer.js b/typo3/sysext/install/Resources/Public/JavaScript/Modules/DatabaseAnalyzer.js
index 4e3fbb9ef6d8c254f147cc01531e5e4839685de5..313c0e98426d60fc74c21660f66e315d00d8ed1d 100644
--- a/typo3/sysext/install/Resources/Public/JavaScript/Modules/DatabaseAnalyzer.js
+++ b/typo3/sysext/install/Resources/Public/JavaScript/Modules/DatabaseAnalyzer.js
@@ -63,7 +63,8 @@ define(['jquery', 'TYPO3/CMS/Install/FlashMessage', 'TYPO3/CMS/Install/ProgressB
 			var lineTemplate = $(this.selectorSuggestionLine).html();
 			var message = ProgressBar.render(Severity.loading, 'Loading...', '');
 			$outputContainer.append(message);
-			$(this.selectorExecuteTrigger).hide();
+			$(this.selectorExecuteTrigger).prop('disabled', true);
+			$(this.selectorAnalyzeTrigger).prop('disabled', true);
 			$.ajax({
 				url: url,
 				cache: false,
@@ -108,7 +109,8 @@ define(['jquery', 'TYPO3/CMS/Install/FlashMessage', 'TYPO3/CMS/Install/ProgressB
 								});
 								$outputContainer.append(aBlock);
 							});
-							$(self.selectorExecuteTrigger).show();
+							$(self.selectorExecuteTrigger).prop('disabled', false);
+							$(self.selectorAnalyzeTrigger).prop('disabled', false);
 						}
 					}
 				},
@@ -130,6 +132,8 @@ define(['jquery', 'TYPO3/CMS/Install/FlashMessage', 'TYPO3/CMS/Install/ProgressB
 				selectedHashes.push($(this).data('hash'));
 			});
 			$outputContainer.empty().html(message);
+			$(this.selectorExecuteTrigger).prop('disabled', true);
+			$(this.selectorAnalyzeTrigger).prop('disabled', true);
 			var postData = {
 				'install': {
 					'action': 'databaseAnalyzerExecute',