diff --git a/lib/music_library_web/live/collection_live/index.html.heex b/lib/music_library_web/live/collection_live/index.html.heex
index 5e36d5ad..47cfc283 100644
--- a/lib/music_library_web/live/collection_live/index.html.heex
+++ b/lib/music_library_web/live/collection_live/index.html.heex
@@ -68,7 +68,6 @@
   <.live_component
     module={MusicLibraryWeb.RecordLive.FormComponent}
     id={@record.id}
-    title={@page_title}
     action={@live_action}
     show_purchased_at={true}
     record={@record}
diff --git a/lib/music_library_web/live/collection_live/show.html.heex b/lib/music_library_web/live/collection_live/show.html.heex
index e4aa7466..8f592d2e 100644
--- a/lib/music_library_web/live/collection_live/show.html.heex
+++ b/lib/music_library_web/live/collection_live/show.html.heex
@@ -233,7 +233,6 @@
   <.live_component
     module={MusicLibraryWeb.RecordLive.FormComponent}
     id={@record.id}
-    title={@page_title}
     action={@live_action}
     show_purchased_at={true}
     record={@record}
diff --git a/lib/music_library_web/live/record_live/form_component.ex b/lib/music_library_web/live/record_live/form_component.ex
index f1b16844..f0e9285a 100644
--- a/lib/music_library_web/live/record_live/form_component.ex
+++ b/lib/music_library_web/live/record_live/form_component.ex
@@ -16,9 +16,12 @@ defmodule MusicLibraryWeb.RecordLive.FormComponent do
     ~H"""
     <div>
       <header>
-        <h1 class="text-base font-medium leading-6 text-zinc-700 dark:text-zinc-400">
-          {@title}
+        <h1 class="text-sm font-medium leading-6 text-zinc-700 dark:text-zinc-400">
+          {Enum.map(@record.artists, & &1.name) |> Enum.join(", ")}
         </h1>
+        <h2 class="text-base font-medium leading-6 text-zinc-700 dark:text-zinc-400">
+          {@record.title}
+        </h2>
       </header>
 
       <.simple_form
diff --git a/lib/music_library_web/live/wishlist_live/index.html.heex b/lib/music_library_web/live/wishlist_live/index.html.heex
index 26396c14..28fe19b7 100644
--- a/lib/music_library_web/live/wishlist_live/index.html.heex
+++ b/lib/music_library_web/live/wishlist_live/index.html.heex
@@ -32,7 +32,6 @@
   <.live_component
     module={MusicLibraryWeb.RecordLive.FormComponent}
     id={@record.id}
-    title={@page_title}
     action={@live_action}
     show_purchased_at={false}
     record={@record}
diff --git a/lib/music_library_web/live/wishlist_live/show.html.heex b/lib/music_library_web/live/wishlist_live/show.html.heex
index 5117be81..ef95b4d4 100644
--- a/lib/music_library_web/live/wishlist_live/show.html.heex
+++ b/lib/music_library_web/live/wishlist_live/show.html.heex
@@ -243,7 +243,6 @@
   <.live_component
     module={MusicLibraryWeb.RecordLive.FormComponent}
     id={@record.id}
-    title={@page_title}
     action={@live_action}
     show_purchased_at={false}
     record={@record}
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index a3000348..1dd4bb26 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -23,8 +23,8 @@ msgstr ""
 msgid "Are you sure?"
 msgstr ""
 
-#: lib/music_library_web/live/record_live/form_component.ex:36
-#: lib/music_library_web/live/record_live/form_component.ex:43
+#: lib/music_library_web/live/record_live/form_component.ex:39
+#: lib/music_library_web/live/record_live/form_component.ex:46
 #, elixir-autogen, elixir-format
 msgid "Choose a value"
 msgstr ""
@@ -38,7 +38,7 @@ msgstr ""
 msgid "Collection"
 msgstr ""
 
-#: lib/music_library_web/live/record_live/form_component.ex:57
+#: lib/music_library_web/live/record_live/form_component.ex:60
 #, elixir-autogen, elixir-format
 msgid "Cover art"
 msgstr ""
@@ -74,7 +74,7 @@ msgstr ""
 msgid "Error!"
 msgstr ""
 
-#: lib/music_library_web/live/record_live/form_component.ex:42
+#: lib/music_library_web/live/record_live/form_component.ex:45
 #, elixir-autogen, elixir-format
 msgid "Format"
 msgstr ""
@@ -129,7 +129,7 @@ msgid "Logout"
 msgstr ""
 
 #: lib/music_library_web/live/collection_live/show.html.heex:159
-#: lib/music_library_web/live/record_live/form_component.ex:47
+#: lib/music_library_web/live/record_live/form_component.ex:50
 #: lib/music_library_web/live/wishlist_live/show.html.heex:177
 #, elixir-autogen, elixir-format
 msgid "MusicBrainz ID"
@@ -141,7 +141,7 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: lib/music_library_web/live/record_live/form_component.ex:64
+#: lib/music_library_web/live/record_live/form_component.ex:67
 #, elixir-autogen, elixir-format
 msgid "No cover selected"
 msgstr ""
@@ -176,7 +176,7 @@ msgstr ""
 msgid "Purchase"
 msgstr ""
 
-#: lib/music_library_web/live/record_live/form_component.ex:53
+#: lib/music_library_web/live/record_live/form_component.ex:56
 #, elixir-autogen, elixir-format
 msgid "Purchased at"
 msgstr ""
@@ -195,24 +195,24 @@ msgstr ""
 msgid "Record imported successfully"
 msgstr ""
 
-#: lib/music_library_web/live/record_live/form_component.ex:124
+#: lib/music_library_web/live/record_live/form_component.ex:127
 #: lib/music_library_web/live/wishlist_live/index.ex:135
 #: lib/music_library_web/live/wishlist_live/show.ex:106
 #, elixir-autogen, elixir-format
 msgid "Record updated successfully"
 msgstr ""
 
-#: lib/music_library_web/live/record_live/form_component.ex:48
+#: lib/music_library_web/live/record_live/form_component.ex:51
 #, elixir-autogen, elixir-format
 msgid "Release"
 msgstr ""
 
-#: lib/music_library_web/live/record_live/form_component.ex:75
+#: lib/music_library_web/live/record_live/form_component.ex:78
 #, elixir-autogen, elixir-format
 msgid "Save"
 msgstr ""
 
-#: lib/music_library_web/live/record_live/form_component.ex:75
+#: lib/music_library_web/live/record_live/form_component.ex:78
 #, elixir-autogen, elixir-format
 msgid "Saving..."
 msgstr ""
@@ -279,7 +279,7 @@ msgstr ""
 msgid "Total wishlist"
 msgstr ""
 
-#: lib/music_library_web/live/record_live/form_component.ex:35
+#: lib/music_library_web/live/record_live/form_component.ex:38
 #, elixir-autogen, elixir-format
 msgid "Type"
 msgstr ""
diff --git a/test/music_library_web/live/collection_live/index_test.exs b/test/music_library_web/live/collection_live/index_test.exs
index 9e1ccdac..150f72e4 100644
--- a/test/music_library_web/live/collection_live/index_test.exs
+++ b/test/music_library_web/live/collection_live/index_test.exs
@@ -203,7 +203,7 @@ defmodule MusicLibraryWeb.CollectionLive.IndexTest do
       conn
       |> visit(~p"/collection")
       |> click_link("#records-#{record.id} a", "Edit")
-      |> assert_has("h1", text: "Edit")
+      |> assert_has("h2", text: escape(record.title))
       |> assert_path(~p"/collection/#{record}/edit")
     end