diff --git a/installation/forms/setup.xml b/installation/forms/setup.xml
index 3f9c6ba350309..1d72aa0df472b 100644
--- a/installation/forms/setup.xml
+++ b/installation/forms/setup.xml
@@ -7,6 +7,7 @@
 			label="INSTL_SELECT_LANGUAGE_TITLE"
 			class="required"
 			default="en-GB"
+			labelclass="hidden"
 		/>
 		<field
 			name="site_name"
diff --git a/installation/language/en-GB/joomla.ini b/installation/language/en-GB/joomla.ini
index 42c31384ed83a..db5ab7338d65d 100644
--- a/installation/language/en-GB/joomla.ini
+++ b/installation/language/en-GB/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Your host needs to use PHP version {{phpversion}} or n
 BUILD_MIN_PHP_ERROR_URL_TEXT="Help me resolve this"
 
 ; Main Config
+INSTL_SELECTED_INSTALL_LANGUAGE="Your current language is: %s"
 INSTL_SELECT_INSTALL_LANG="Select Installation Language"
 INSTL_SELECT_LANGUAGE_TITLE="Select Language"
 INSTL_SETUP_LOGIN_DATA="Setup Login Data"
diff --git a/installation/template/js/setup.js b/installation/template/js/setup.js
index e52141385bdd4..baa9b07ddb0ea 100644
--- a/installation/template/js/setup.js
+++ b/installation/template/js/setup.js
@@ -164,14 +164,35 @@ Joomla.checkDbCredentials = function() {
     document.getElementById('jform_site_name').focus();
   }
 
-  // Select language
-  var languageEl = document.getElementById('jform_language');
+  // Handle language chooser
+  const languageForm = document.getElementById('languageForm');
 
-  if (languageEl) {
-    languageEl.addEventListener('change', function(e) {
-      var form = document.getElementById('languageForm');
-      Joomla.setlanguage(form)
-    })
+  // It's a template(!!!)
+  const languageTemplate = document.getElementById('languageSelect');
+
+  if (languageForm && languageTemplate) {
+    // Check if we have the language field
+    const languageEl = languageTemplate.content.getElementById('jform_language');
+
+    if (languageEl) {
+      // We use event bubbling to handle the change event
+      languageForm.addEventListener('change', function (e) {
+
+        if (e.target.id === 'jform_language') {
+          e.target.closest('dialog').close();
+
+          // Set the language
+          Joomla.setlanguage(languageForm);
+        }
+      })
+
+      // Show language name
+      const currentLanguageName = document.getElementById('languageForm-current');
+
+      if (currentLanguageName) {
+        currentLanguageName.innerText = languageEl.options[languageEl.selectedIndex].text;
+      }
+    }
   }
 
   if (document.getElementById('step1')) {
diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss
index cb11435d1ea5a..60d4a420d423a 100644
--- a/installation/template/scss/template.scss
+++ b/installation/template/scss/template.scss
@@ -308,8 +308,25 @@ body {
   }
 }
 
-.languageForm {
-  padding: 0 0 30px;
+#languageForm {
+  joomla-dialog {
+    dialog {
+      &::backdrop {
+        background-color: rgba(0, 0, 0, .5);
+      }
+    }
+    .joomla-dialog-header {
+      display: flex;
+      align-items: center;
+      margin-bottom: .5rem;
+      h3 {
+        margin: 0 .5rem;
+      }
+      .buttons-holder {
+        margin-left: auto;
+      };
+    }
+  }
 
   .form-select {
     width: 100%;
diff --git a/installation/tmpl/setup/default.php b/installation/tmpl/setup/default.php
index 9b6978d193017..479c448f8d759 100644
--- a/installation/tmpl/setup/default.php
+++ b/installation/tmpl/setup/default.php
@@ -16,24 +16,13 @@
 HTMLHelper::_('behavior.formvalidator');
 
 /** @var \Joomla\CMS\Installation\View\Setup\HtmlView $this */
+
+$wa = $this->getDocument()->getWebAssetManager();
+
+$wa->useScript('joomla.dialog-autocreate');
 ?>
 
 <div id="installer-view" data-page-name="setup">
-    <form action="index.php" method="post" id="languageForm" class="lang-select">
-        <fieldset class="j-install-step active">
-            <legend class="j-install-step-header">
-                <span class="icon-language" aria-hidden="true"></span> <?php echo Text::_('INSTL_SELECT_INSTALL_LANG'); ?>
-            </legend>
-            <div class="j-install-step-form">
-                <div class="mb-3">
-                    <?php echo $this->form->renderField('language'); ?>
-                </div>
-                <input type="hidden" name="task" value="language.set">
-                <input type="hidden" name="format" value="json">
-                <?php echo HTMLHelper::_('form.token'); ?>
-            </div>
-        </fieldset>
-    </form>
     <form action="index.php" method="post" id="adminForm" class="form-validate">
         <fieldset id="installStep1" class="j-install-step active">
             <legend class="j-install-step-header">
@@ -134,5 +123,26 @@
         <input type="hidden" name="admin_password2" id="jform_admin_password2">
         <?php echo HTMLHelper::_('form.token'); ?>
     </form>
+    <form action="index.php" method="post" id="languageForm" class="lang-select">
+        <div class="d-flex align-items-center">
+            <span class="fas fa-globe me-1" aria-hidden="true"></span>
+            <?php
+                $link = HTMLHelper::_('link', '#languageSelect', '', ['id' => 'languageForm-current', 'data-joomla-dialog' => '###dialogattr###', 'class' => 'btn btn-link ps-1']);
+
+                // Dialog needs single quotes for attributes, so use single quotes...
+                $link = str_replace('"###dialogattr###', '\'{"textHeader": "' . Text::_('INSTL_SELECT_INSTALL_LANG') . '", "iconHeader":"icon-language"}\'', $link);
+
+                echo Text::sprintf('INSTL_SELECTED_INSTALL_LANGUAGE', $link);
+            ?>
+        </div>
+        <template id="languageSelect">
+            <div class="mb-3">
+                <?php echo $this->form->renderField('language'); ?>
+            </div>
+        </template>
+        <input type="hidden" name="task" value="language.set">
+        <input type="hidden" name="format" value="json">
+        <?php echo HTMLHelper::_('form.token'); ?>
+    </form>
 
 </div>
diff --git a/libraries/src/Language/LanguageHelper.php b/libraries/src/Language/LanguageHelper.php
index 6dfa9afbba8b8..c4753acafa2cd 100644
--- a/libraries/src/Language/LanguageHelper.php
+++ b/libraries/src/Language/LanguageHelper.php
@@ -111,6 +111,11 @@ public static function detectLanguage()
                 $browserLang         = substr($browserLang, 0, strcspn($browserLang, ';'));
                 $primary_browserLang = substr($browserLang, 0, 2);
 
+                // Some browser return only "fr" or "de", so let's try to use it like "fr-fr" or "de-de"
+                if (\strlen($browserLang) == 2) {
+                    $browserLang = $browserLang . '-' . $browserLang;
+                }
+
                 foreach ($systemLangs as $systemLang) {
                     // Take off 3 letters iso code languages as they can't match browsers' languages and default them to en
                     $Jinstall_lang = $systemLang->lang_code;