diff --git a/src/build-output.test.ts b/src/build-output.test.ts
index e5bc1a0e..10385caa 100644
--- a/src/build-output.test.ts
+++ b/src/build-output.test.ts
@@ -655,6 +655,12 @@ describe("Forgejo 15 native integration", () => {
     expect(forks).toContain("No one has forked this repository yet");
   });
 
+  it("heads organization settings with the settings context, as personal settings", () => {
+    const layout = fs.readFileSync(path.join(ROOT_DIR, "templates", "org", "settings", "layout_head.tmpl"), "utf-8");
+    expect(layout).not.toContain('template "org/header"');
+    expect(layout).toContain('template "components/common/settings/context"');
+  });
+
   it("matches GitHub's repository About, visibility, and code-search details", () => {
     const headerStyle = fs.readFileSync(path.join(ROOT_DIR, "styles", "templates", "repo", "header.ts"), "utf-8");
     const headerTemplate = fs.readFileSync(path.join(ROOT_DIR, "templates", "repo", "home_header.tmpl"), "utf-8");
diff --git a/styles/pages/organization.css b/styles/pages/organization.css
index 49e09034..c12dc8a9 100644
--- a/styles/pages/organization.css
+++ b/styles/pages/organization.css
@@ -304,22 +304,6 @@
   }
 }
 
-.page-content.organization.settings .ui.container.org-identity {
-  min-height: 48px;
-  margin-bottom: 24px;
-  padding-bottom: 0;
-  border: 0;
-}
-
-.page-content.organization.settings .ui.container.org-identity > img.org-avatar {
-  width: 48px;
-  height: 48px;
-}
-
-.page-content.organization.settings .ui.container.org-identity .org-title h1 {
-  font-size: 20px;
-}
-
 .organization .list-header {
   margin-bottom: 16px;
 }
diff --git a/templates/org/settings/layout_head.tmpl b/templates/org/settings/layout_head.tmpl
index 1c88d8a5..8dc7de88 100644
--- a/templates/org/settings/layout_head.tmpl
+++ b/templates/org/settings/layout_head.tmpl
@@ -1,6 +1,9 @@
 {{template "base/head" .ctxData}}
 <div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
-	{{template "org/header" .ctxData}}
+	{{/* GitHub heads organization settings with the settings context, not the organization's profile header. */}}
+	<div class="ui container theme-settings-context-container">
+		{{template "components/common/settings/context" dict "Avatar" (ctx.AvatarUtils.Avatar .ctxData.Org 48) "Title" (.ctxData.Org.DisplayName) "Login" .ctxData.Org.Name "Subtitle" (ctx.Locale.Tr "org.settings.options") "Link" .ctxData.Org.HomeLink "LinkIcon" "octicon-organization" "LinkLabel" (ctx.Locale.Tr "your_profile")}}
+	</div>
 	<div class="ui container flex-container theme-settings">
 		{{template "org/settings/navbar" .ctxData}}
 		<div class="flex-container-main">