diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index bb89f55..6a38e20 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -198,9 +198,6 @@ input[type=text]:read-only {
 }
 
 
-.flashes {
-  height: 2.1rem;
-}
 .flash {
   align-items: center;
   border-radius: 0.2rem;
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4832335..1d5609e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,4 +1,5 @@
 module ApplicationHelper
+  # TODO: replace legacy content_tag with tag.tagname
   class TabularFormBuilder < ActionView::Helpers::FormBuilder
     (field_helpers - [:label]).each do |selector|
       class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
@@ -88,6 +89,15 @@ module ApplicationHelper
     image_element_to(:link, name, image, options, html_options)
   end
 
+  def render_flash_messages
+    flash.map do |entry, message|
+      tag.div class: "flash #{entry}" do
+        tag.div(sanitize(message)) + tag.button(sanitize("&times;"), tabindex: -1,
+                                       onclick: "this.parentElement.style.display='none';")
+      end
+    end.join.html_safe
+  end
+
   private
 
   def image_element_to(type, name, image = nil, options = nil, html_options = {})
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index ecf1441..bcc525a 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -36,16 +36,9 @@
       <% end %>
     </header>
 
-    <!--
-    <div class="flashes">
-      <% flash.each do |entry, message| %>
-        <div class="flash <%= entry %>">
-          <div><%= sanitize message %></div>
-          <button tabindex="-1" onclick="this.parentElement.style.display='none';">&times;</button>
-        </div>
-      <% end %>
-      </div>
-    -->
+    <div id="flashes">
+      <%= render_flash_messages %>
+    </div>
 
     <%# Allow overwriting/clearing navigation menu for some views %>
     <nav class="navigation">
diff --git a/app/views/layouts/application.turbo_stream.erb b/app/views/layouts/application.turbo_stream.erb
new file mode 100644
index 0000000..3c080af
--- /dev/null
+++ b/app/views/layouts/application.turbo_stream.erb
@@ -0,0 +1,4 @@
+<%= turbo_stream.update :flashes do %>
+  <%= render_flash_messages %>
+<% end %>
+<%= yield %>