diff --git a/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseSelect.php b/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseSelect.php
index 793ec21719bc..8a7d469d2805 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseSelect.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseSelect.php
@@ -48,6 +48,8 @@ public function execute() {
 		$this->initializeDatabaseConnection();
 		$postValues = $this->postValues['values'];
 		$localConfigurationPathValuePairs = array();
+		/** @var $configurationManager \TYPO3\CMS\Core\Configuration\ConfigurationManager */
+		$configurationManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager');
 		if ($postValues['type'] === 'new') {
 			$newDatabaseName = $postValues['new'];
 			if (strlen($newDatabaseName) <= 50) {
@@ -74,12 +76,17 @@ public function execute() {
 				$result[] = $errorStatus;
 			}
 		} elseif ($postValues['type'] === 'existing') {
-			$localConfigurationPathValuePairs['DB/database'] = $postValues['existing'];
+			// Only store database information when it's empty
+			$this->databaseConnection->setDatabaseName($postValues['existing']);
+			$this->databaseConnection->sql_select_db();
+			$existingTables = $this->databaseConnection->admin_get_tables();
+			$isInitialInstallation = $configurationManager->getConfigurationValueByPath('SYS/isInitialInstallationInProgress');
+			if (!$isInitialInstallation || count($existingTables) === 0) {
+				$localConfigurationPathValuePairs['DB/database'] = $postValues['existing'];
+			}
 		}
 
 		if (!empty($localConfigurationPathValuePairs)) {
-			/** @var $configurationManager \TYPO3\CMS\Core\Configuration\ConfigurationManager */
-			$configurationManager = $this->objectManager->get('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager');
 			$configurationManager->setLocalConfigurationValuesByPathValuePairs($localConfigurationPathValuePairs);
 		}
 
@@ -140,17 +147,18 @@ protected function getDatabaseList($initialInstallation) {
 		if ($initialInstallation === FALSE) {
 			return $allPossibleDatabases;
 		} else {
-			// In first installation we only show empty databases (no tables)
-			$databasesWithoutTables = array();
+			// In first installation we show all databases but disable not empty ones (with tables)
+			$databases = array();
 			foreach ($allPossibleDatabases as $database) {
 				$this->databaseConnection->setDatabaseName($database);
 				$this->databaseConnection->sql_select_db();
 				$existingTables = $this->databaseConnection->admin_get_tables();
-				if (count($existingTables) === 0) {
-					$databasesWithoutTables[] = $database;
-				}
+				$databases[] = array(
+					'name' => $database,
+					'tables' => count($existingTables),
+				);
 			}
-			return $databasesWithoutTables;
+			return $databases;
 		}
 	}
 
diff --git a/typo3/sysext/install/Resources/Private/Templates/Action/Step/DatabaseSelect.html b/typo3/sysext/install/Resources/Private/Templates/Action/Step/DatabaseSelect.html
index 1cdf38b1227b..c20b44a1979d 100644
--- a/typo3/sysext/install/Resources/Private/Templates/Action/Step/DatabaseSelect.html
+++ b/typo3/sysext/install/Resources/Private/Templates/Action/Step/DatabaseSelect.html
@@ -41,8 +41,15 @@ <h3>Select database</h3>
 									onfocus="document.getElementById('t3-install-form-db-select-type-existing').checked=true;"
 								>
 									<option value="">Select database</option>
-									<f:for each="{databaseList}" as="database" iteration="databaseIterator">
-										<option value="{database}"{f:if(condition: databaseIterator.isFirst ,then: ' selected="selected"')}>{database}</option>
+									<f:for each="{databaseList}" as="database">
+										<f:if condition="{database.tables}">
+											<f:then>
+												<option value="{database.name}" disabled="disabled">{database.name} ({database.tables} Tables)</option>
+											</f:then>
+											<f:else>
+												<option value="{database.name}">{database.name}</option>
+											</f:else>
+										</f:if>
 									</f:for>
 								</select>
 							</div>