diff --git a/app/assets/stylesheets/components/stories.scss b/app/assets/stylesheets/components/stories.scss
index e4396195d..51215a4ee 100644
--- a/app/assets/stylesheets/components/stories.scss
+++ b/app/assets/stylesheets/components/stories.scss
@@ -138,6 +138,7 @@
     margin-left: calc(var(--su-1) * -1);
     font-size: var(--fs-s);
     display: flex;
+    flex-wrap: wrap;
     gap: 1px;
     color: var(--base-80);
   }
diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb
index 0ed6ab226..8b40336fc 100644
--- a/app/views/articles/show.html.erb
+++ b/app/views/articles/show.html.erb
@@ -151,7 +151,7 @@
             </h1>
 
             <% cache("main-article-tags-#{@article.cached_tag_list}", expires_in: 30.hours) do %>
-              <div class="spec__tags flex">
+              <div class="spec__tags flex flex-wrap">
                 <% @article.cached_tag_list_array.each do |tag| %>
                   <%= render_tag_link(tag) %>
                 <% end %>
diff --git a/app/views/notifications/shared/_article_preview.html.erb b/app/views/notifications/shared/_article_preview.html.erb
index 927594257..fc7405cba 100644
--- a/app/views/notifications/shared/_article_preview.html.erb
+++ b/app/views/notifications/shared/_article_preview.html.erb
@@ -1,9 +1,9 @@
 <article class="notification__preview crayons-card">
   <a href="<%= json_data["article"]["path"] %>" class="crayons-link block notification__preview__inner">
     <h3 class="notification__preview__title"><%= h(json_data["article"]["title"]) %></h3>
-    <div class="-ml-1 flex">
+    <div class="flex flex-wrap fs-s">
       <% json_data["article"]["cached_tag_list_array"].each do |tag| %>
-        <span class="mr-1"><span class="opacity-50">#</span><%= tag %></span>
+        <span class="mr-2"><span class="opacity-50">#</span><%= tag %></span>
       <% end %>
     </div>
   </a>