diff --git a/lib/cannery_web/live/live_helpers.ex b/lib/cannery_web/live/live_helpers.ex
index 7dd7d32d..293caf90 100644
--- a/lib/cannery_web/live/live_helpers.ex
+++ b/lib/cannery_web/live/live_helpers.ex
@@ -37,8 +37,6 @@ defmodule CanneryWeb.LiveHelpers do
       </.modal>
   """
   def modal(assigns) do
-    assigns = assign_new(assigns, :return_to, fn -> nil end)
-
     ~H"""
     <div
       id="modal"
@@ -57,23 +55,12 @@ defmodule CanneryWeb.LiveHelpers do
         phx-window-keydown={hide_modal()}
         phx-key="escape"
       >
-        <%= if @return_to do %>
-          <%= live_patch to: @return_to,
-                     id: "close",
-                     class:
-                       "absolute top-8 right-10 text-gray-500 hover:text-gray-800 transition-all duration-500 ease-in-out",
-                     phx_click: hide_modal() do %>
-            <i class="fa-fw fa-lg fas fa-times"></i>
-          <% end %>
-        <% else %>
-          <a
-            id="close"
-            href="#"
-            class="absolute top-8 right-10 text-gray-500 hover:text-gray-800 transition-all duration-500 ease-in-out"
-            phx-click={hide_modal()}
-          >
-            <i class="fa-fw fa-lg fas fa-times"></i>
-          </a>
+        <%= live_patch to: @return_to,
+                    id: "close",
+                    class:
+                      "absolute top-8 right-10 text-gray-500 hover:text-gray-800 transition-all duration-500 ease-in-out",
+                    phx_click: hide_modal() do %>
+          <i class="fa-fw fa-lg fas fa-times"></i>
         <% end %>
 
         <div class="p-8 flex flex-col space-y-4 justify-start items-center">