diff --git a/lib/music_library_web/live/artist_live/show.html.heex b/lib/music_library_web/live/artist_live/show.html.heex
index cab997bf..6895f5ef 100644
--- a/lib/music_library_web/live/artist_live/show.html.heex
+++ b/lib/music_library_web/live/artist_live/show.html.heex
@@ -217,12 +217,9 @@
   />
 </div>
 
-<.modal
+<.structured_modal
   :if={@live_action == :import}
   id="record-modal"
-  class="md:min-w-2xl max-w-sm md:max-w-3xl mt-8"
-  placement="top"
-  open
   on_close={JS.patch(~p"/artists/#{@artist.musicbrainz_id}")}
 >
   <.live_component
@@ -234,14 +231,11 @@
     initial_query={"arid:#{@artist.musicbrainz_id}"}
     icon_name="hero-plus"
   />
-</.modal>
+</.structured_modal>
 
-<.modal
+<.structured_modal
   :if={@live_action == :edit}
   id="artist-info-modal"
-  class="md:min-w-2xl max-w-sm md:max-w-3xl mt-8"
-  placement="top"
-  open
   on_close={JS.patch(~p"/artists/#{@artist.musicbrainz_id}")}
 >
   <.live_component
@@ -252,4 +246,4 @@
     artist={@artist}
     patch={~p"/artists/#{@artist.musicbrainz_id}"}
   />
-</.modal>
+</.structured_modal>
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 6fa90805..801d0e1c 100644
--- a/lib/music_library_web/live/collection_live/index.html.heex
+++ b/lib/music_library_web/live/collection_live/index.html.heex
@@ -75,12 +75,9 @@
   />
 </.structured_modal>
 
-<.modal
+<.structured_modal
   :if={@live_action == :import}
   id="record-modal"
-  class="md:min-w-2xl max-w-sm md:max-w-3xl mt-8"
-  placement="top"
-  open
   on_close={JS.patch(back_path(@record_list_params))}
 >
   <.live_component
@@ -93,14 +90,11 @@
     initial_query=""
     icon_name="hero-plus"
   />
-</.modal>
+</.structured_modal>
 
-<.modal
+<.structured_modal
   :if={@live_action == :barcode_scan}
   id="barcode-scanner-modal"
-  class="md:min-w-2xl max-w-sm md:max-w-3xl mt-8"
-  placement="top"
-  open
   on_close={JS.patch(back_path(@record_list_params))}
 >
   <.live_component
@@ -110,6 +104,6 @@
     action={@live_action}
     patch={back_path(@record_list_params)}
   />
-</.modal>
+</.structured_modal>
 
 <.pagination id={:bottom_pagination} pagination_params={@record_list_params} />
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 fdccd891..47f9d50b 100644
--- a/lib/music_library_web/live/collection_live/show.html.heex
+++ b/lib/music_library_web/live/collection_live/show.html.heex
@@ -321,12 +321,9 @@
   record={@record}
 />
 
-<.modal
+<.structured_modal
   :if={@live_action == :edit}
   id="record-modal"
-  class="md:min-w-2xl max-w-sm md:max-w-3xl mt-8"
-  placement="top"
-  open
   on_close={JS.patch(~p"/collection/#{@record}")}
 >
   <.live_component
@@ -337,4 +334,4 @@
     record={@record}
     patch={~p"/collection/#{@record}"}
   />
-</.modal>
+</.structured_modal>
diff --git a/lib/music_library_web/live/online_store_template_live/index.html.heex b/lib/music_library_web/live/online_store_template_live/index.html.heex
index a6ff3b53..fb55af06 100644
--- a/lib/music_library_web/live/online_store_template_live/index.html.heex
+++ b/lib/music_library_web/live/online_store_template_live/index.html.heex
@@ -91,12 +91,9 @@
   </ul>
 </div>
 
-<.modal
+<.structured_modal
   :if={@live_action in [:new, :edit]}
   id="template-modal"
-  class="md:min-w-2xl max-w-sm md:max-w-3xl mt-8"
-  placement="top"
-  open
   on_close={JS.patch(~p"/online-store-templates")}
 >
   <.live_component
@@ -107,4 +104,4 @@
     template={@template}
     patch={~p"/online-store-templates"}
   />
-</.modal>
+</.structured_modal>
diff --git a/lib/music_library_web/live/scrobble_rules_live/index.html.heex b/lib/music_library_web/live/scrobble_rules_live/index.html.heex
index bc33495a..b8ecfe0a 100644
--- a/lib/music_library_web/live/scrobble_rules_live/index.html.heex
+++ b/lib/music_library_web/live/scrobble_rules_live/index.html.heex
@@ -99,12 +99,9 @@
   </ul>
 </div>
 
-<.modal
+<.structured_modal
   :if={@live_action in [:new, :edit]}
   id="scrobble_rule-modal"
-  class="md:min-w-2xl max-w-sm md:max-w-3xl mt-8"
-  placement="top"
-  open
   on_close={JS.patch(~p"/scrobble-rules")}
 >
   <.live_component
@@ -115,4 +112,4 @@
     scrobble_rule={@scrobble_rule}
     patch={~p"/scrobble-rules"}
   />
-</.modal>
+</.structured_modal>
diff --git a/lib/music_library_web/live/universal_search_live/index.html.heex b/lib/music_library_web/live/universal_search_live/index.html.heex
index 8a556d47..3e6b5c9b 100644
--- a/lib/music_library_web/live/universal_search_live/index.html.heex
+++ b/lib/music_library_web/live/universal_search_live/index.html.heex
@@ -1,8 +1,6 @@
-<.modal
+<.structured_modal
   :if={@show_modal}
   id="universal-search-root"
-  class="md:min-w-2xl max-w-sm md:max-w-3xl mt-8"
-  placement="top"
   open={@show_modal}
   on_close={JS.push("close_modal", value: %{})}
 >
@@ -103,4 +101,4 @@
   
 <!-- Footer with keyboard shortcuts -->
   <.keyboard_shortcuts total_results={@total_results} />
-</.modal>
+</.structured_modal>
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 4a1e35fb..ace6255d 100644
--- a/lib/music_library_web/live/wishlist_live/index.html.heex
+++ b/lib/music_library_web/live/wishlist_live/index.html.heex
@@ -48,12 +48,9 @@
   record_edit_path={fn record -> ~p"/wishlist/#{record}/edit" end}
 />
 
-<.modal
+<.structured_modal
   :if={@live_action == :edit}
   id="record-modal"
-  class="md:min-w-2xl max-w-sm md:max-w-3xl mt-8"
-  placement="top"
-  open
   on_close={JS.patch(back_path(@record_list_params))}
 >
   <.live_component
@@ -64,14 +61,11 @@
     record={@record}
     patch={back_path(@record_list_params)}
   />
-</.modal>
+</.structured_modal>
 
-<.modal
+<.structured_modal
   :if={@live_action == :import}
   id="record-modal"
-  class="md:min-w-2xl max-w-sm md:max-w-3xl mt-8"
-  placement="top"
-  open
   on_close={JS.patch(back_path(@record_list_params))}
 >
   <.live_component
@@ -84,6 +78,6 @@
     initial_query=""
     icon_name="hero-plus"
   />
-</.modal>
+</.structured_modal>
 
 <.pagination id={:bottom_pagination} pagination_params={@record_list_params} />
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 a3317440..3f88e53d 100644
--- a/lib/music_library_web/live/wishlist_live/show.html.heex
+++ b/lib/music_library_web/live/wishlist_live/show.html.heex
@@ -302,12 +302,9 @@
 
 <.json_viewer title={gettext("MusicBrainz data")} data={@record.musicbrainz_data} />
 
-<.modal
+<.structured_modal
   :if={@live_action == :edit}
   id="record-modal"
-  class="md:min-w-2xl max-w-sm md:max-w-3xl mt-8"
-  placement="top"
-  open
   on_close={JS.patch(~p"/wishlist/#{@record}")}
 >
   <.live_component
@@ -318,4 +315,4 @@
     record={@record}
     patch={~p"/wishlist/#{@record}"}
   />
-</.modal>
+</.structured_modal>