diff --git a/web/src/App.jsx b/web/src/App.jsx
index ce43268ee5..c5095e795c 100644
--- a/web/src/App.jsx
+++ b/web/src/App.jsx
@@ -26,8 +26,19 @@ import { useInstallerClient } from "~/context/installer";
 import { STARTUP, INSTALL } from "~/client/phase";
 import { BUSY } from "~/client/status";
 
+import {
+  About,
+  Disclosure,
+  Installation,
+  IssuesLink,
+  LoadingEnvironment,
+  LogsButton,
+  ShowLogButton,
+  ShowTerminalButton,
+  Sidebar
+} from "~/components/core";
+import { ChangeProductLink } from "~/components/software";
 import { Layout, Title, DBusError } from "~/components/layout";
-import { Installation, LoadingEnvironment } from "~/components/core";
 
 function App() {
   const client = useInstallerClient();
@@ -71,10 +82,23 @@ function App() {
   };
 
   return (
-    <Layout>
-      <Title>Agama</Title>
-      <Content />
-    </Layout>
+    <>
+      <Sidebar>
+        <ChangeProductLink />
+        <IssuesLink />
+        <Disclosure label="Diagnostic tools" data-keep-sidebar-open>
+          <ShowLogButton />
+          <LogsButton data-keep-sidebar-open="true" />
+          <ShowTerminalButton />
+        </Disclosure>
+        <About />
+      </Sidebar>
+
+      <Layout>
+        <Title>Agama</Title>
+        <Content />
+      </Layout>
+    </>
   );
 }
 
diff --git a/web/src/App.test.jsx b/web/src/App.test.jsx
index 9adae67c95..4294e691bb 100644
--- a/web/src/App.test.jsx
+++ b/web/src/App.test.jsx
@@ -36,6 +36,7 @@ jest.mock("~/components/layout/DBusError", () => mockComponent("D-BusError Mock"
 jest.mock("~/components/core/LoadingEnvironment", () => mockComponent("LoadingEnvironment Mock"));
 jest.mock("~/components/questions/Questions", () => mockComponent("Questions Mock"));
 jest.mock("~/components/core/Installation", () => mockComponent("Installation Mock"));
+jest.mock("~/components/core/Sidebar", () => mockComponent("Sidebar Mock"));
 
 // this object holds the mocked callbacks
 const callbacks = {};
diff --git a/web/src/assets/styles/app.scss b/web/src/assets/styles/app.scss
index e052951a3d..5e4ef53c32 100644
--- a/web/src/assets/styles/app.scss
+++ b/web/src/assets/styles/app.scss
@@ -1,5 +1,13 @@
 #root {
-  height: 100%;
+  position: relative;
+  /** block-size fallbacks **/
+  height: 100vh;
+  height: 100dvb;
+  block-size: 100vh;
+  /** END of block-size fallbacks **/
+  block-size: 100dvb;
+  max-inline-size: var(--ui-max-inline-size);
+  margin-inline: auto;
 }
 
 // Make proposal actions compact
diff --git a/web/src/assets/styles/blocks.scss b/web/src/assets/styles/blocks.scss
index abea6d5559..baf603ea2d 100644
--- a/web/src/assets/styles/blocks.scss
+++ b/web/src/assets/styles/blocks.scss
@@ -84,7 +84,7 @@ section > .content {
   right: 0;
   z-index: 1;
   inline-size: 70%;
-  box-shadow: 0 0 20px 10px var(--color-primary);
+  box-shadow: -10px 10px 20px 0 var(--color-primary);
 }
 
 .sidebar header {
@@ -95,10 +95,6 @@ section > .content {
   border-top: 1px solid var(--color-gray);
 }
 
-.sidebar > div {
-  margin-inline-start: var(--pf-global--spacer--md);
-}
-
 .sidebar a, .sidebar button {
   font-size: 16px;
   font-weight: var(--fw-bold);
diff --git a/web/src/assets/styles/layout.scss b/web/src/assets/styles/layout.scss
index 517872e26a..eca0fc4683 100644
--- a/web/src/assets/styles/layout.scss
+++ b/web/src/assets/styles/layout.scss
@@ -13,8 +13,7 @@
   block-size: 100vh;
   /** END of block-size fallbacks **/
   block-size: 100dvb;
-  max-inline-size: 1024px;
-  margin-inline: auto;
+
   background: var(--wrapper-background);
 
   svg {
diff --git a/web/src/assets/styles/variables.scss b/web/src/assets/styles/variables.scss
index 637ce4b83c..41cde075b0 100644
--- a/web/src/assets/styles/variables.scss
+++ b/web/src/assets/styles/variables.scss
@@ -16,6 +16,8 @@
   --lh-medium: 1.6;
   --lh-large: 1.7;
 
+  --ui-max-inline-size: 1024px;
+
   --spacer-small: 0.5rem;
   --spacer-normal: 1rem;
   --spacer-medium: 1.5rem;
diff --git a/web/src/components/core/Sidebar.jsx b/web/src/components/core/Sidebar.jsx
index 7d8b27e856..dd1e7eee0c 100644
--- a/web/src/components/core/Sidebar.jsx
+++ b/web/src/components/core/Sidebar.jsx
@@ -92,8 +92,8 @@ export default function Sidebar ({ children }) {
         <button
           onClick={open}
           className="plain-control"
-          aria-label="Show navigation and other options"
-          aria-controls="navigation-and-options"
+          aria-label="Show global options"
+          aria-controls="global-options"
           aria-expanded={isOpen}
         >
           <If
@@ -104,10 +104,10 @@ export default function Sidebar ({ children }) {
         </button>
       </AppActions>
 
-      <nav
-        id="navigation-and-options"
+      <aside
+        id="global-options"
         className="wrapper sidebar"
-        aria-label="Navigation and other options"
+        aria-label="Global options"
         data-state={isOpen ? "visible" : "hidden"}
       >
         <header className="split justify-between">
@@ -133,7 +133,7 @@ export default function Sidebar ({ children }) {
           </a>
           { targetInfo }
         </footer>
-      </nav>
+      </aside>
     </>
   );
 }
diff --git a/web/src/components/core/Sidebar.test.jsx b/web/src/components/core/Sidebar.test.jsx
index ee2a5f9634..fd05aa5a26 100644
--- a/web/src/components/core/Sidebar.test.jsx
+++ b/web/src/components/core/Sidebar.test.jsx
@@ -21,11 +21,15 @@
 
 import React from "react";
 import { screen, within } from "@testing-library/react";
-import { installerRender, mockLayout, withNotificationProvider } from "~/test-utils";
+import { installerRender, mockLayout, mockComponent, withNotificationProvider } from "~/test-utils";
 import { Sidebar } from "~/components/core";
 import { createClient } from "~/client";
 
+// Mock layout
 jest.mock("~/components/layout/Layout", () => mockLayout());
+// Mock some components using contexts and not relevant for below tests
+jest.mock("~/components/core/LogsButton", () => mockComponent("LogsButton Mock"));
+jest.mock("~/components/software/ChangeProductLink", () => mockComponent("ChangeProductLink Mock"));
 
 let hasIssues = false;
 
@@ -45,7 +49,7 @@ beforeEach(() => {
 it("renders the sidebar initially hidden", async () => {
   installerRender(withNotificationProvider(<Sidebar />));
 
-  const nav = await screen.findByRole("navigation", { name: /options/i });
+  const nav = await screen.findByRole("complementary", { name: /options/i });
   expect(nav).toHaveAttribute("data-state", "hidden");
 });
 
@@ -53,11 +57,11 @@ it("renders a link for displaying the sidebar", async () => {
   const { user } = installerRender(withNotificationProvider(<Sidebar />));
 
   const link = await screen.findByLabelText(/Show/i);
-  const nav = await screen.findByRole("navigation", { name: /options/i });
+  const sidebar = await screen.findByRole("complementary", { name: /options/i });
 
-  expect(nav).toHaveAttribute("data-state", "hidden");
+  expect(sidebar).toHaveAttribute("data-state", "hidden");
   await user.click(link);
-  expect(nav).toHaveAttribute("data-state", "visible");
+  expect(sidebar).toHaveAttribute("data-state", "visible");
 });
 
 it("renders a link for hiding the sidebar", async () => {
@@ -66,12 +70,12 @@ it("renders a link for hiding the sidebar", async () => {
   const openLink = await screen.findByLabelText(/Show/i);
   const closeLink = await screen.findByLabelText(/Hide/i);
 
-  const nav = await screen.findByRole("navigation", { name: /options/i });
+  const sidebar = await screen.findByRole("complementary", { name: /options/i });
 
   await user.click(openLink);
-  expect(nav).toHaveAttribute("data-state", "visible");
+  expect(sidebar).toHaveAttribute("data-state", "visible");
   await user.click(closeLink);
-  expect(nav).toHaveAttribute("data-state", "hidden");
+  expect(sidebar).toHaveAttribute("data-state", "hidden");
 });
 
 it("moves the focus to the close action after opening it", async () => {
@@ -100,36 +104,36 @@ describe("onClick bubbling", () => {
 
     const openLink = screen.getByLabelText(/Show/i);
     await user.click(openLink);
-    const nav = screen.getByRole("navigation", { name: /options/i });
-    expect(nav).toHaveAttribute("data-state", "visible");
+    const sidebar = screen.getByRole("complementary", { name: /options/i });
+    expect(sidebar).toHaveAttribute("data-state", "visible");
 
     // user clicks in the sidebar body
-    await user.click(nav);
-    expect(nav).toHaveAttribute("data-state", "visible");
+    await user.click(sidebar);
+    expect(sidebar).toHaveAttribute("data-state", "visible");
 
     // user clicks on a button set for keeping the sidebar open
-    const keepOpenButton = within(nav).getByRole("button", { name: "Keep it open!" });
+    const keepOpenButton = within(sidebar).getByRole("button", { name: "Keep it open!" });
     await user.click(keepOpenButton);
-    expect(nav).toHaveAttribute("data-state", "visible");
+    expect(sidebar).toHaveAttribute("data-state", "visible");
 
     // user clicks a button NOT set for keeping the sidebar open
-    const button = within(nav).getByRole("button", { name: "Do something" });
+    const button = within(sidebar).getByRole("button", { name: "Do something" });
     await user.click(button);
-    expect(nav).toHaveAttribute("data-state", "hidden");
+    expect(sidebar).toHaveAttribute("data-state", "hidden");
 
     // open it again
     await user.click(openLink);
-    expect(nav).toHaveAttribute("data-state", "visible");
+    expect(sidebar).toHaveAttribute("data-state", "visible");
 
     // user clicks on link set for keeping the sidebar open
-    const keepOpenLink = within(nav).getByRole("link", { name: "Keep it open!" });
+    const keepOpenLink = within(sidebar).getByRole("link", { name: "Keep it open!" });
     await user.click(keepOpenLink);
-    expect(nav).toHaveAttribute("data-state", "visible");
+    expect(sidebar).toHaveAttribute("data-state", "visible");
 
     // user clicks on link NOT set for keeping the sidebar open
-    const link = within(nav).getByRole("link", { name: "Goes somewhere" });
+    const link = within(sidebar).getByRole("link", { name: "Goes somewhere" });
     await user.click(link);
-    expect(nav).toHaveAttribute("data-state", "hidden");
+    expect(sidebar).toHaveAttribute("data-state", "hidden");
   });
 });
 
diff --git a/web/src/components/layout/Layout.jsx b/web/src/components/layout/Layout.jsx
index 680c622f58..fc5b5fddbb 100644
--- a/web/src/components/layout/Layout.jsx
+++ b/web/src/components/layout/Layout.jsx
@@ -23,16 +23,6 @@ import React from "react";
 
 import logoUrl from "~/assets/suse-horizontal-logo.svg";
 import { createTeleporter } from "react-teleporter";
-import { ChangeProductLink } from "~/components/software";
-import {
-  About,
-  Disclosure,
-  IssuesLink,
-  LogsButton,
-  Sidebar,
-  ShowLogButton,
-  ShowTerminalButton
-} from "~/components/core";
 
 const PageTitle = createTeleporter();
 const PageActions = createTeleporter();
@@ -89,20 +79,8 @@ function Layout({ children }) {
           <PageActions.Target as="span" />
           <HeaderActions.Target as="span" />
         </div>
-      </header>
 
-      <Sidebar>
-        <>
-          <ChangeProductLink />
-          <IssuesLink />
-          <Disclosure label="Diagnostic tools" data-keep-sidebar-open>
-            <ShowLogButton />
-            <LogsButton data-keep-sidebar-open="true" />
-            <ShowTerminalButton />
-          </Disclosure>
-          <About />
-        </>
-      </Sidebar>
+      </header>
 
       <main className="stack">
         {children}