diff --git a/ui/page/home/view.jsx b/ui/page/home/view.jsx
index 483faa4d2..964620ed7 100644
--- a/ui/page/home/view.jsx
+++ b/ui/page/home/view.jsx
@@ -61,21 +61,20 @@ function HomePage(props: Props) {
       {rowData.map(({ title, link, help, options = {} }) => (
         <div key={title} className="claim-grid__wrapper">
           <h1 className="section__actions">
-            {link ? (
-              <Button
-                className="claim-grid__title"
-                button="link"
-                navigate={link}
-                iconRight={ICONS.ARROW_RIGHT}
-                label={title}
-              />
-            ) : (
-              <span className="claim-grid__title">{title}</span>
-            )}
+            <span className="claim-grid__title">{title}</span>
             {help}
           </h1>
 
           <ClaimTilesDiscover {...options} />
+          {link && (
+            <Button
+              className="claim-grid__title--secondary"
+              button="link"
+              navigate={link}
+              iconRight={ICONS.ARROW_RIGHT}
+              label={title}
+            />
+          )}
         </div>
       ))}
     </Page>
diff --git a/ui/scss/component/_claim-list.scss b/ui/scss/component/_claim-list.scss
index a003327bf..4de8d0acb 100644
--- a/ui/scss/component/_claim-list.scss
+++ b/ui/scss/component/_claim-list.scss
@@ -284,6 +284,8 @@
 }
 
 .claim-grid__wrapper {
+  display: flex;
+  flex-direction: column;
   &:not(:first-of-type) {
     margin-top: var(--spacing-l);
   }
@@ -303,6 +305,11 @@
   }
 }
 
+.claim-grid__title--secondary {
+  margin-left: auto;
+  margin-top: calc(var(--spacing-m) * -1);
+}
+
 .claim-grid__help {
   margin-bottom: 12px;