diff --git a/lib/music_library_web/components/record_form.ex b/lib/music_library_web/components/record_form.ex
index 7f805f3b..7bb315ea 100644
--- a/lib/music_library_web/components/record_form.ex
+++ b/lib/music_library_web/components/record_form.ex
@@ -301,7 +301,10 @@ defmodule MusicLibraryWeb.Components.RecordForm do
                 name="cover_search_query"
                 value={@cover_search_query}
                 phx-keyup="update_cover_search_query"
+                phx-keydown="search_covers"
+                phx-key="Enter"
                 phx-target={@myself}
+                onkeydown="if(event.key==='Enter')event.preventDefault()"
               />
             </div>
             <.button
diff --git a/lib/music_library_web/live/artist_live/form.ex b/lib/music_library_web/live/artist_live/form.ex
index 91ec700c..e3276c36 100644
--- a/lib/music_library_web/live/artist_live/form.ex
+++ b/lib/music_library_web/live/artist_live/form.ex
@@ -92,7 +92,10 @@ defmodule MusicLibraryWeb.ArtistLive.Form do
                 name="image_search_query"
                 value={@image_search_query}
                 phx-keyup="update_image_search_query"
+                phx-keydown="search_images"
+                phx-key="Enter"
                 phx-target={@myself}
+                onkeydown="if(event.key==='Enter')event.preventDefault()"
               />
             </div>
             <.button