diff --git a/lib/music_library_web/live/artist_live/show.ex b/lib/music_library_web/live/artist_live/show.ex
index 1c6c7ab5..63f60bb2 100644
--- a/lib/music_library_web/live/artist_live/show.ex
+++ b/lib/music_library_web/live/artist_live/show.ex
@@ -98,18 +98,6 @@ defmodule MusicLibraryWeb.ArtistLive.Show do
 
             <div class="flex items-center">
               <.button_group>
-                <.button
-                  variant="soft"
-                  phx-click={MusicLibraryWeb.Components.Notes.open("artist-notes-sheet")}
-                >
-                  <span class="sr-only">{gettext("Open Notes")}</span>
-                  <.icon
-                    name="hero-pencil"
-                    class="icon"
-                    aria-hidden="true"
-                    data-slot="icon"
-                  />
-                </.button>
                 <.button
                   variant="soft"
                   phx-click={MusicLibraryWeb.Components.Chat.open("artist-chat-sheet")}
@@ -123,18 +111,6 @@ defmodule MusicLibraryWeb.ArtistLive.Show do
                   />
                   <span :if={@chat_count > 0} class="text-xs font-medium">{@chat_count}</span>
                 </.button>
-                <.button
-                  variant="soft"
-                  phx-click={Fluxon.open_dialog("debug-data")}
-                >
-                  <span class="sr-only">{gettext("Debug data")}</span>
-                  <.icon
-                    name="hero-code-bracket"
-                    class="icon"
-                    aria-hidden="true"
-                    data-slot="icon"
-                  />
-                </.button>
                 <.dropdown id={"actions-#{@artist.musicbrainz_id}"} placement="bottom-end">
                   <:toggle>
                     <.button variant="soft">
@@ -148,6 +124,34 @@ defmodule MusicLibraryWeb.ArtistLive.Show do
                     </.button>
                   </:toggle>
                   <.focus_wrap id={"actions-#{@artist.musicbrainz_id}-focus-wrap"}>
+                    <.dropdown_link
+                      id={"actions-#{@artist.musicbrainz_id}-notes"}
+                      phx-click={MusicLibraryWeb.Components.Notes.open("artist-notes-sheet")}
+                    >
+                      <.icon
+                        name="hero-pencil"
+                        class="mr-1 size-4"
+                        aria-hidden="true"
+                        data-slot="icon"
+                      />
+                      {gettext("Notes")}
+                    </.dropdown_link>
+
+                    <.dropdown_link
+                      id={"actions-#{@artist.musicbrainz_id}-debug"}
+                      phx-click={Fluxon.open_dialog("debug-data")}
+                    >
+                      <.icon
+                        name="hero-code-bracket"
+                        class="mr-1 size-4"
+                        aria-hidden="true"
+                        data-slot="icon"
+                      />
+                      {gettext("Debug data")}
+                    </.dropdown_link>
+
+                    <.dropdown_separator />
+
                     <.dropdown_link
                       id={"actions-#{@artist.musicbrainz_id}-edit"}
                       patch={~p"/artists/#{@artist.musicbrainz_id}/edit"}
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 7718a734..0ba488b0 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -1269,11 +1269,6 @@ msgstr ""
 msgid "Note updated successfully"
 msgstr ""
 
-#: lib/music_library_web/live/artist_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Open Notes"
-msgstr ""
-
 #: lib/music_library_web/components/notes.ex
 #, elixir-autogen, elixir-format
 msgid "Read"
@@ -2248,6 +2243,7 @@ msgstr ""
 msgid "Sending..."
 msgstr ""
 
+#: lib/music_library_web/live/artist_live/show.ex
 #: lib/music_library_web/live/collection_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Notes"
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 01760894..297217fd 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -1269,11 +1269,6 @@ msgstr ""
 msgid "Note updated successfully"
 msgstr ""
 
-#: lib/music_library_web/live/artist_live/show.ex
-#, elixir-autogen, elixir-format
-msgid "Open Notes"
-msgstr ""
-
 #: lib/music_library_web/components/notes.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Read"
@@ -2248,6 +2243,7 @@ msgstr ""
 msgid "Sending..."
 msgstr ""
 
+#: lib/music_library_web/live/artist_live/show.ex
 #: lib/music_library_web/live/collection_live/show.ex
 #, elixir-autogen, elixir-format
 msgid "Notes"