diff --git a/src/UI/Areas/Identity/Pages/Account/Manage/_Layout.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
index f8728b543f..34b7c17840 100644
--- a/src/UI/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
+++ b/src/UI/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
@@ -1,5 +1,12 @@
 @{ 
-    Layout = "/Areas/Identity/Pages/_Layout.cshtml";
+    if (ViewData.TryGetValue("ParentLayout", out var parentLayout))
+    {
+        Layout = (string)parentLayout;
+    }
+    else
+    {
+        Layout = "/Areas/Identity/Pages/_Layout.cshtml";
+    }
 }
 
 <h2>Manage your account</h2>
diff --git a/src/UI/Areas/Identity/Pages/Account/Manage/_ViewStart.cshtml b/src/UI/Areas/Identity/Pages/Account/Manage/_ViewStart.cshtml
new file mode 100644
index 0000000000..4afb326bcc
--- /dev/null
+++ b/src/UI/Areas/Identity/Pages/Account/Manage/_ViewStart.cshtml
@@ -0,0 +1,7 @@
+@{
+    if (Layout != "_Layout")
+    {
+        ViewData["ParentLayout"] = Layout;
+        Layout = "./_Layout.cshtml";
+    }
+}
\ No newline at end of file