diff --git a/assets/css/utilities.css b/assets/css/utilities.css
index f3efd5870..468db5b9a 100644
--- a/assets/css/utilities.css
+++ b/assets/css/utilities.css
@@ -35,32 +35,6 @@
 
   /* Animations */
 
-  .fade-in {
-    animation: fade-in-frames 200ms ease-out;
-  }
-
-  .fade-out {
-    animation: fade-out-frames 200ms ease-in;
-  }
-
-  @keyframes fade-in-frames {
-    from {
-      opacity: 0;
-    }
-    to {
-      opacity: 1;
-    }
-  }
-
-  @keyframes fade-out-frames {
-    from {
-      opacity: 1;
-    }
-    to {
-      opacity: 0;
-    }
-  }
-
   .delay-200 {
     animation: delay-frames 200ms;
   }
diff --git a/lib/livebook_web/components/core_components.ex b/lib/livebook_web/components/core_components.ex
index 293e76e4f..02d8de92f 100644
--- a/lib/livebook_web/components/core_components.ex
+++ b/lib/livebook_web/components/core_components.ex
@@ -172,12 +172,14 @@ defmodule LivebookWeb.CoreComponents do
     ~H"""
     <div
       id={@id}
-      class={["fixed z-[10000] inset-0", if(@show, do: "fade-in", else: "hidden")]}
-      phx-remove={JS.transition("fade-out")}
+      class="fixed z-[10000] inset-0 hidden"
+      phx-mounted={@show && show_modal(@id)}
+      phx-remove={hide_modal(@id)}
+      data-cancel={modal_on_cancel(@patch, @navigate)}
       {@rest}
     >
       <!-- Modal container -->
-      <div class="h-screen flex items-center justify-center p-4">
+      <div id={"#{@id}-container"} class="h-screen flex items-center justify-center p-4">
         <!-- Overlay -->
         <div class="absolute z-0 inset-0 bg-gray-500 opacity-75" aria-hidden="true"></div>
         <!-- Modal box -->
@@ -192,17 +194,15 @@ defmodule LivebookWeb.CoreComponents do
           aria-modal="true"
           tabindex="0"
           autofocus
-          phx-window-keydown={hide_modal(@id)}
-          phx-click-away={hide_modal(@id)}
+          phx-window-keydown={JS.exec("data-cancel", to: "##{@id}")}
+          phx-click-away={JS.exec("data-cancel", to: "##{@id}")}
           phx-key="escape"
         >
-          <.link :if={@patch} patch={@patch} class="hidden" id={"#{@id}-return"}></.link>
-          <.link :if={@navigate} patch={@navigate} class="hidden" id={"#{@id}-return"}></.link>
           <button
             type="button"
             class="absolute top-6 right-6 text-gray-400 flex space-x-1 items-center"
             aria_label="close modal"
-            phx-click={hide_modal(@id)}
+            phx-click={JS.exec("data-cancel", to: "##{@id}")}
           >
             <span class="text-sm">(esc)</span>
             <.remix_icon icon="close-line" class="text-2xl" />
@@ -219,14 +219,19 @@ defmodule LivebookWeb.CoreComponents do
   defp modal_width_class(:big), do: "max-w-4xl"
   defp modal_width_class(:large), do: "max-w-6xl"
 
+  defp modal_on_cancel(nil, nil), do: JS.exec("phx-remove")
+  defp modal_on_cancel(nil, navigate), do: JS.patch(navigate)
+  defp modal_on_cancel(patch, nil), do: JS.patch(patch)
+
   @doc """
   Shows a modal rendered with `modal/1`.
   """
   def show_modal(js \\ %JS{}, id) do
     js
-    |> JS.show(
-      to: "##{id}",
-      transition: {"ease-out duration-200", "opacity-0", "opacity-100"}
+    |> JS.show(to: "##{id}")
+    |> JS.transition(
+      {"ease-out duration-200", "opacity-0", "opacity-100"},
+      to: "##{id}-container"
     )
   end
 
@@ -235,11 +240,11 @@ defmodule LivebookWeb.CoreComponents do
   """
   def hide_modal(js \\ %JS{}, id) do
     js
-    |> JS.hide(
-      to: "##{id}",
-      transition: {"ease-in duration-200", "opacity-100", "opacity-0"}
+    |> JS.transition(
+      {"ease-in duration-200", "opacity-100", "opacity-0"},
+      to: "##{id}-container"
     )
-    |> JS.dispatch("click", to: "##{id}-return")
+    |> JS.hide(to: "##{id}", transition: {"block", "block", "hidden"})
   end
 
   @doc """
diff --git a/lib/livebook_web/live/hub/edit/team_component.ex b/lib/livebook_web/live/hub/edit/team_component.ex
index d1dd1949f..2d73f3b77 100644
--- a/lib/livebook_web/live/hub/edit/team_component.ex
+++ b/lib/livebook_web/live/hub/edit/team_component.ex
@@ -96,13 +96,12 @@ defmodule LivebookWeb.Hub.Edit.TeamComponent do
                   <.remix_icon icon="settings-line" /> Manage organization
                 </a>
 
-                <button
-                  phx-click={show_modal("show-key-modal")}
-                  phx-target={@myself}
+                <.link
+                  patch={~p"/hub/#{@hub.id}?show-key=true"}
                   class="hover:text-blue-600 cursor-pointer"
                 >
                   <.remix_icon icon="key-2-fill" /> Display Teams key
-                </button>
+                </.link>
                 <%= if @default? do %>
                   <button
                     phx-click="remove_as_default"
@@ -253,7 +252,7 @@ defmodule LivebookWeb.Hub.Edit.TeamComponent do
             </div>
           </div>
 
-          <.modal show={@show_key} id="show-key-modal" width={:medium} patch={~p"/hub/#{@hub.id}"}>
+          <.modal :if={@show_key} id="key-modal" show width={:medium} patch={~p"/hub/#{@hub.id}"}>
             <.teams_key_modal teams_key={@hub.teams_key} />
           </.modal>
 
diff --git a/test/livebook_teams/web/hub/new_live_test.exs b/test/livebook_teams/web/hub/new_live_test.exs
index f8759852c..fcbf9e546 100644
--- a/test/livebook_teams/web/hub/new_live_test.exs
+++ b/test/livebook_teams/web/hub/new_live_test.exs
@@ -52,11 +52,11 @@ defmodule LivebookWeb.Hub.NewLiveTest do
 
       # access the page and shows the teams key modal
       {:ok, view, _html} = live(conn, "/hub/team-#{name}?show-key=true")
-      refute has_element?(view, "#show-key-modal.hidden")
+      assert has_element?(view, "#key-modal")
 
       # access the page when closes the modal
       assert {:ok, view, _html} = live(conn, "/hub/team-#{name}")
-      assert has_element?(view, "#show-key-modal.hidden")
+      refute has_element?(view, "#key-modal")
 
       # checks if the hub is in the sidebar
       assert_sidebar_hub(view, "team-#{name}", name)
@@ -113,11 +113,11 @@ defmodule LivebookWeb.Hub.NewLiveTest do
 
       # access the page and shows the teams key modal
       {:ok, view, _html} = live(conn, "/hub/team-#{name}?show-key=true")
-      refute has_element?(view, "#show-key-modal.hidden")
+      assert has_element?(view, "#key-modal")
 
       # access the page when closes the modal
       assert {:ok, view, _html} = live(conn, "/hub/team-#{name}")
-      assert has_element?(view, "#show-key-modal.hidden")
+      refute has_element?(view, "#key-modal")
 
       # checks if the hub is in the sidebar
       assert_sidebar_hub(view, "team-#{name}", name)