diff --git a/typo3/sysext/lang/Classes/Controller/LanguageController.php b/typo3/sysext/lang/Classes/Controller/LanguageController.php
index b0a12dd29c46db055d07465b716c9e9d92950b70..172cc77bec5797a17cc19c2eca25c0bb31935ff1 100644
--- a/typo3/sysext/lang/Classes/Controller/LanguageController.php
+++ b/typo3/sysext/lang/Classes/Controller/LanguageController.php
@@ -78,10 +78,12 @@ class LanguageController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControl
 			$languageSelectionForm->setSelectedLanguages($this->languageRepository->findSelected());
 		}
 
-		if (empty($extensions)) {
+		$hasSelectedLanguages = !empty($languageSelectionForm->getSelectedLanguages());
+		if ($hasSelectedLanguages && empty($extensions)) {
 			$extensions = $this->extensionRepository->findAll();
 		}
 
+		$this->view->assign('hasSelectedLanguages', $hasSelectedLanguages);
 		$this->view->assign('languageSelectionForm', $languageSelectionForm);
 		$this->view->assign('extensions', $extensions);
 	}
diff --git a/typo3/sysext/lang/Classes/Domain/Model/LanguageSelectionForm.php b/typo3/sysext/lang/Classes/Domain/Model/LanguageSelectionForm.php
index ccea98d73d2b2b749e7bb148d4b86a51e2a8cd08..a7f752c187ec6742ae0c7218d78364a06ab27e1f 100644
--- a/typo3/sysext/lang/Classes/Domain/Model/LanguageSelectionForm.php
+++ b/typo3/sysext/lang/Classes/Domain/Model/LanguageSelectionForm.php
@@ -52,7 +52,7 @@ class LanguageSelectionForm extends \TYPO3\CMS\Extbase\DomainObject\AbstractEnti
 	/**
 	 * Setter for the selected languages
 	 *
-	 * @param array $locale Selected languages
+	 * @param array $selectedLanguages Selected languages
 	 * @return void
 	 */
 	public function setSelectedLanguages(array $selectedLanguages) {
diff --git a/typo3/sysext/lang/Resources/Private/Templates/Language/Index.html b/typo3/sysext/lang/Resources/Private/Templates/Language/Index.html
index 4bcd4191839bc565a77f6d1d6d14b6159f53ed29..f332826e57d2f5eb755b35d84e7c5be68e3ef9eb 100644
--- a/typo3/sysext/lang/Resources/Private/Templates/Language/Index.html
+++ b/typo3/sysext/lang/Resources/Private/Templates/Language/Index.html
@@ -3,9 +3,11 @@
 <f:layout name="Default"/>
 
 <f:section name="iconButtons">
-	<span class="menuItem updateItem"><lang:be.spriteIcon icon="actions-system-extension-download" title="{f:translate(key:'button.update')}" /><f:translate key="button.update"/></span>
-	&nbsp;
-	<span class="menuItem cancelItem"><lang:be.spriteIcon icon="status-status-permission-denied" title="{f:translate(key:'button.cancel')}" /><f:translate key="button.cancel"/></span>
+	<f:if condition="{hasSelectedLanguages}">
+		<span class="menuItem updateItem"><lang:be.spriteIcon icon="actions-system-extension-download" title="{f:translate(key:'button.update')}" /><f:translate key="button.update"/></span>
+		&nbsp;
+		<span class="menuItem cancelItem"><lang:be.spriteIcon icon="status-status-permission-denied" title="{f:translate(key:'button.cancel')}" /><f:translate key="button.cancel"/></span>
+	</f:if>
 </f:section>
 
 
@@ -13,7 +15,6 @@
 	<h1><f:translate key="header.module" /></h1>
 
 	<f:flashMessages renderMode="div" />
-
 	<table border="0" cellpadding="0" cellspacing="0">
 		<tr>
 			<td class="languageSelectionListContainer">
@@ -21,8 +22,10 @@
 				<f:render partial="LanguageSelectionList" arguments="{_all}" />
 			</td>
 			<td class="translationUpdateListContainer">
-				<h3><f:translate key="header.translationUpdateList" /></h3>
-				<f:render partial="TranslationUpdateList" arguments="{_all}" />
+				<f:if condition="{hasSelectedLanguages}">
+					<h3><f:translate key="header.translationUpdateList" /></h3>
+					<f:render partial="TranslationUpdateList" arguments="{_all}" />
+				</f:if>
 			</td>
 		</tr>
 	</table>