diff --git a/app/controllers/goals_controller.rb b/app/controllers/goals_controller.rb
index 70ae70c34..3105a4c9a 100644
--- a/app/controllers/goals_controller.rb
+++ b/app/controllers/goals_controller.rb
@@ -45,6 +45,11 @@ class GoalsController < ApplicationController
       currency: Current.family.primary_currency_code
     )
     @linkable_accounts = linkable_accounts_for_new
+    @breadcrumbs = [
+      [ t("breadcrumbs.home"), root_path ],
+      [ t("goals.index.title"), goals_path ],
+      [ t("goals.new.heading"), nil ]
+    ]
   end
 
   def create
diff --git a/app/views/goals/new.html.erb b/app/views/goals/new.html.erb
index 45f5cb71a..0f673e668 100644
--- a/app/views/goals/new.html.erb
+++ b/app/views/goals/new.html.erb
@@ -1,19 +1,34 @@
-<%= render DS::Dialog.new(width: "lg") do |dialog| %>
-  <% dialog.with_header(custom_header: true) do %>
-    <div class="flex items-start justify-between gap-3">
-      <div class="flex items-start gap-3">
-        <%= render DS::FilledIcon.new(variant: :container, icon: "target", size: "md", rounded: true) %>
-        <div>
-          <h2 class="text-base font-medium text-primary"><%= t(".heading") %></h2>
-          <p class="text-sm text-secondary mt-0.5" data-goal-stepper-modal-subtitle>
-            <%= t(".step1_subtitle") %>
-          </p>
+<% if turbo_frame_request? %>
+  <%= render DS::Dialog.new(width: "lg") do |dialog| %>
+    <% dialog.with_header(custom_header: true) do %>
+      <div class="flex items-start justify-between gap-3">
+        <div class="flex items-start gap-3">
+          <%= render DS::FilledIcon.new(variant: :container, icon: "target", size: "md", rounded: true) %>
+          <div>
+            <h2 class="text-base font-medium text-primary"><%= t(".heading") %></h2>
+            <p class="text-sm text-secondary mt-0.5" data-goal-stepper-modal-subtitle>
+              <%= t(".step1_subtitle") %>
+            </p>
+          </div>
         </div>
+        <%= render DS::Button.new(variant: "icon", icon: "x", title: t("common.close"), aria_label: t("common.close"), data: { action: "DS--dialog#close" }) %>
       </div>
-      <%= render DS::Button.new(variant: "icon", icon: "x", title: t("common.close"), aria_label: t("common.close"), data: { action: "DS--dialog#close" }) %>
-    </div>
+    <% end %>
+    <% dialog.with_body do %>
+      <%= render "form_stepper", goal: @goal, linkable_accounts: @linkable_accounts %>
+    <% end %>
   <% end %>
-  <% dialog.with_body do %>
+<% else %>
+  <div class="max-w-2xl mx-auto py-8 px-4">
+    <header class="mb-6 flex items-start gap-3">
+      <%= render DS::FilledIcon.new(variant: :container, icon: "target", size: "md", rounded: true) %>
+      <div>
+        <h1 class="text-xl font-medium text-primary"><%= t(".heading") %></h1>
+        <p class="text-sm text-secondary mt-0.5" data-goal-stepper-modal-subtitle>
+          <%= t(".step1_subtitle") %>
+        </p>
+      </div>
+    </header>
     <%= render "form_stepper", goal: @goal, linkable_accounts: @linkable_accounts %>
-  <% end %>
+  </div>
 <% end %>