diff --git a/pages/[[...slug]].tsx b/pages/[[...slug]].tsx
index 6f94349..54e53b9 100644
--- a/pages/[[...slug]].tsx
+++ b/pages/[[...slug]].tsx
@@ -17,8 +17,6 @@ const FallbackPage: NextPageWithLayout = () => {
 };
 
 // This old fallback page uses App, which already has PageLayout built-in.
-FallbackPage.layoutComponent = ({ children }: { children: JSX.Element }) => {
-  return children;
-};
+FallbackPage.renderWithLayout = (children: JSX.Element) => children;
 
 export default FallbackPage;
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 11c0b1e..3899d15 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -14,7 +14,7 @@ import buildApolloClient from "../src/app/apolloClient";
 import PageLayout from "../src/app/PageLayout";
 
 export type NextPageWithLayout<P = {}, IP = P> = NextPage<P, IP> & {
-  layoutComponent?: (props: { children: JSX.Element }) => JSX.Element;
+  renderWithLayout?: (children: JSX.Element) => JSX.Element;
 };
 
 const theme = extendTheme({
@@ -38,7 +38,8 @@ const theme = extendTheme({
 type AppPropsWithLayout = AppProps & { Component: NextPageWithLayout };
 
 export default function DTIApp({ Component, pageProps }: AppPropsWithLayout) {
-  const LayoutComponent = Component.layoutComponent ?? PageLayout;
+  const renderWithLayout =
+    Component.renderWithLayout ?? renderWithDefaultLayout;
 
   React.useEffect(() => setupLogging(), []);
 
@@ -63,9 +64,7 @@ export default function DTIApp({ Component, pageProps }: AppPropsWithLayout) {
         <ApolloProviderWithAuth0>
           <ChakraProvider theme={theme}>
             <CSSReset />
-            <LayoutComponent>
-              <Component {...pageProps} />
-            </LayoutComponent>
+            {renderWithLayout(<Component {...pageProps} />)}
           </ChakraProvider>
         </ApolloProviderWithAuth0>
       </Auth0Provider>
@@ -73,6 +72,10 @@ export default function DTIApp({ Component, pageProps }: AppPropsWithLayout) {
   );
 }
 
+function renderWithDefaultLayout(children: JSX.Element) {
+  return <PageLayout>{children}</PageLayout>;
+}
+
 function ApolloProviderWithAuth0({ children }: { children: React.ReactNode }) {
   const auth0 = useAuth0();
   const auth0Ref = React.useRef(auth0);
diff --git a/pages/internal/assetImage.tsx b/pages/internal/assetImage.tsx
index 7c92c17..23f941b 100644
--- a/pages/internal/assetImage.tsx
+++ b/pages/internal/assetImage.tsx
@@ -5,8 +5,7 @@ const InternalAssetImagePageWrapper: NextPageWithLayout = () => {
   return <InternalAssetImagePage />;
 };
 
-InternalAssetImagePageWrapper.layoutComponent = ({ children }) => {
-  return children;
-};
+InternalAssetImagePageWrapper.renderWithLayout = (children: JSX.Element) =>
+  children;
 
 export default InternalAssetImagePageWrapper;
diff --git a/pages/items/[itemId].tsx b/pages/items/[itemId].tsx
index b6ff963..c50244e 100644
--- a/pages/items/[itemId].tsx
+++ b/pages/items/[itemId].tsx
@@ -7,7 +7,7 @@ const ItemPageWrapper: NextPageWithLayout = () => {
   return <ItemPage />;
 };
 
-ItemPageWrapper.layoutComponent = ({ children }) => {
+ItemPageWrapper.renderWithLayout = (children) => {
   return (
     <PageLayout>
       <ItemSearchPageToolbar marginBottom="8" />
diff --git a/pages/items/search/index.tsx b/pages/items/search/index.tsx
index 7acc2ed..0d51433 100644
--- a/pages/items/search/index.tsx
+++ b/pages/items/search/index.tsx
@@ -7,7 +7,7 @@ const ItemSearchPageWrapper: NextPageWithLayout = () => {
   return <ItemSearchPage />;
 };
 
-ItemSearchPageWrapper.layoutComponent = ({ children }) => {
+ItemSearchPageWrapper.renderWithLayout = (children) => {
   return (
     <PageLayout>
       <ItemSearchPageToolbar marginBottom="6" />