diff --git a/apps/storefront/components/Tokens/TokenList/TokenList.tsx b/apps/storefront/components/Tokens/TokenList/TokenList.tsx
index 168eb58536..34a083b6c4 100644
--- a/apps/storefront/components/Tokens/TokenList/TokenList.tsx
+++ b/apps/storefront/components/Tokens/TokenList/TokenList.tsx
@@ -225,18 +225,20 @@ const TokenList = ({
                 Brand: {capitalizeString(brand)}
               </Dropdown.Trigger>
               <Dropdown>
-                <Dropdown.Item onClick={() => setBrand('digdir')}>
-                  Digdir
-                </Dropdown.Item>
-                <Dropdown.Item onClick={() => setBrand('altinn')}>
-                  Altinn
-                </Dropdown.Item>
-                <Dropdown.Item onClick={() => setBrand('tilsynet')}>
-                  Tilsynet
-                </Dropdown.Item>
-                <Dropdown.Item onClick={() => setBrand('portal')}>
-                  Brreg
-                </Dropdown.Item>
+                <Dropdown.List>
+                  <Dropdown.Item onClick={() => setBrand('digdir')}>
+                    Digdir
+                  </Dropdown.Item>
+                  <Dropdown.Item onClick={() => setBrand('altinn')}>
+                    Altinn
+                  </Dropdown.Item>
+                  <Dropdown.Item onClick={() => setBrand('tilsynet')}>
+                    Tilsynet
+                  </Dropdown.Item>
+                  <Dropdown.Item onClick={() => setBrand('portal')}>
+                    Brreg
+                  </Dropdown.Item>
+                </Dropdown.List>
               </Dropdown>
             </Dropdown.Context>
           )}
@@ -246,12 +248,14 @@ const TokenList = ({
                 Mode: {capitalizeString(mode)}
               </Dropdown.Trigger>
               <Dropdown>
-                <Dropdown.Item onClick={() => setMode('light')}>
-                  Light
-                </Dropdown.Item>
-                <Dropdown.Item onClick={() => setMode('dark')}>
-                  Dark
-                </Dropdown.Item>
+                <Dropdown.List>
+                  <Dropdown.Item onClick={() => setMode('light')}>
+                    Light
+                  </Dropdown.Item>
+                  <Dropdown.Item onClick={() => setMode('dark')}>
+                    Dark
+                  </Dropdown.Item>
+                </Dropdown.List>
               </Dropdown>
             </Dropdown.Context>
           )}
diff --git a/apps/storefront/layouts/PageLayout/PageLayout.tsx b/apps/storefront/layouts/PageLayout/PageLayout.tsx
index 89ce5666d9..e9648c4ef8 100644
--- a/apps/storefront/layouts/PageLayout/PageLayout.tsx
+++ b/apps/storefront/layouts/PageLayout/PageLayout.tsx
@@ -36,7 +36,7 @@ const PageLayout = ({ content, data }: PageLayoutProps) => {
             </Link>
             <Paragraph size='lg' variant='short' asChild>
               <div className={classes.meta}>
-                <span>{data.author && <div>{data.author}</div>}</span>
+                <span>{data.author && <span>{data.author}</span>}</span>
                 <span className={classes.separator}> - </span>
                 <span>{data.date && <div>{data.date}</div>}</span>
               </div>