diff --git a/app/views/layouts/_flash_messages.html.haml b/app/views/layouts/_flash_messages.html.haml
index 55dd13ac8..f8b280447 100644
--- a/app/views/layouts/_flash_messages.html.haml
+++ b/app/views/layouts/_flash_messages.html.haml
@@ -1,5 +1,5 @@
-#flash_messages
-  #flash_message.center
+#flash_messages{ tabindex: '-1' }
+  #flash_message.center{ class: defined?(unique_classname) ? unique_classname : '' }
     - if flash.any?
       - flash.each do |key, value|
         - sticky = defined?(sticky) ? sticky : false
diff --git a/app/views/layouts/application.turbo_stream.haml b/app/views/layouts/application.turbo_stream.haml
index c359b707a..bb1d0ef95 100644
--- a/app/views/layouts/application.turbo_stream.haml
+++ b/app/views/layouts/application.turbo_stream.haml
@@ -1,7 +1,9 @@
 - if flash.any?
-  = turbo_stream.replace 'flash_messages', partial: 'layouts/flash_messages'
+  - unique_classname= "u#{SecureRandom.hex}"
+  = turbo_stream.replace 'flash_messages', partial: 'layouts/flash_messages', locals: { unique_classname: }
+  = turbo_stream.focus 'flash_messages'
   = turbo_stream.show 'flash_messages'
-  = turbo_stream.hide 'flash_messages', delay: 30000
+  = turbo_stream.hide_all ".#{unique_classname}", delay: 15000
   - flash.clear
 
 = yield