diff --git a/web/package/agama-web-ui.changes b/web/package/agama-web-ui.changes
index 3fa653e7ff..ec62ba79c9 100644
--- a/web/package/agama-web-ui.changes
+++ b/web/package/agama-web-ui.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun 26 13:14:06 UTC 2024 - David Diaz <dgonzalez@suse.com>
+
+- Bring back installer options when selecting a product
+  (gh#openSUSE/agama#1384).
+
 -------------------------------------------------------------------
 Wed Jun 26 08:31:31 UTC 2024 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 
diff --git a/web/src/SimpleLayout.jsx b/web/src/SimpleLayout.jsx
index 828721ed15..edad34d16f 100644
--- a/web/src/SimpleLayout.jsx
+++ b/web/src/SimpleLayout.jsx
@@ -21,16 +21,34 @@
 
 import React from "react";
 import { Outlet } from "react-router-dom";
-import { Page } from "@patternfly/react-core";
+import {
+  Masthead, MastheadContent,
+  Page,
+  Toolbar, ToolbarContent, ToolbarGroup, ToolbarItem
+} from "@patternfly/react-core";
+import { InstallerOptions } from "./components/core";
 import { _ } from "~/i18n";
 
 /**
  * Simple layout for displaying content that comes before product configuration
  * TODO: improve documentation
  */
-export default function SimpleLayout({ showOutlet = true, children }) {
+export default function SimpleLayout({ showOutlet = true, showInstallerOptions = false, children }) {
   return (
     <Page>
+      <Masthead backgroundColor="light200">
+        <MastheadContent>
+          <Toolbar>
+            <ToolbarContent>
+              <ToolbarGroup align={{ default: "alignRight" }}>
+                <ToolbarItem>
+                  {showInstallerOptions && <InstallerOptions />}
+                </ToolbarItem>
+              </ToolbarGroup>
+            </ToolbarContent>
+          </Toolbar>
+        </MastheadContent>
+      </Masthead>
       {showOutlet ? <Outlet /> : children}
     </Page>
   );
diff --git a/web/src/components/core/InstallerOptions.jsx b/web/src/components/core/InstallerOptions.jsx
index 8b270e8c99..3802164f15 100644
--- a/web/src/components/core/InstallerOptions.jsx
+++ b/web/src/components/core/InstallerOptions.jsx
@@ -56,7 +56,7 @@ export default function InstallerOptions() {
   const [inProgress, setInProgress] = useState(false);
 
   // FIXME: Installer options should be available in the login too.
-  if (location.pathname.includes("login")) return;
+  if (["/login", "/products/progress"].includes(location.pathname)) return;
 
   const open = () => setIsOpen(true);
   const close = () => setIsOpen(false);
@@ -109,7 +109,7 @@ export default function InstallerOptions() {
               fieldId="keymap"
               label={_("Keyboard layout")}
             >
-              { localConnection()
+              {localConnection()
                 ? (
                   <FormSelect
                     id="keymap"
@@ -123,12 +123,12 @@ export default function InstallerOptions() {
                     )}
                   </FormSelect>
                 )
-                : _("Cannot be changed in remote installation") }
+                : _("Cannot be changed in remote installation")}
             </FormGroup>
           </Form>
         </Flex>
         <Popup.Actions>
-          <Popup.Confirm form="installer-l10n" type="submit" autoFocus isDisabled={inProgress}>{_("Accept")}</Popup.Confirm>
+          <Popup.Confirm form="installer-l10n" type="submit" autoFocus isDisabled={inProgress} isLoading={inProgress}>{_("Accept")}</Popup.Confirm>
           <Popup.Cancel onClick={close} isDisabled={inProgress} />
         </Popup.Actions>
       </Popup>
diff --git a/web/src/router.js b/web/src/router.js
index b3c4c2c86e..31628d73d1 100644
--- a/web/src/router.js
+++ b/web/src/router.js
@@ -61,7 +61,7 @@ const protectedRoutes = [
         ]
       },
       {
-        element: <SimpleLayout />,
+        element: <SimpleLayout showInstallerOptions />,
         children: [productsRoute]
       }
     ]