diff --git a/backend/app/views/spree/admin/style_guide/topics/messaging/_flashes.html.erb b/backend/app/views/spree/admin/style_guide/topics/messaging/_flashes.html.erb
index 91da22004b8..5dd45c22f87 100644
--- a/backend/app/views/spree/admin/style_guide/topics/messaging/_flashes.html.erb
+++ b/backend/app/views/spree/admin/style_guide/topics/messaging/_flashes.html.erb
@@ -5,9 +5,15 @@
 <script>
   $('.trigger-flash').on('click', function(){
     type = $(this).data('flashType');
-    flash = $("<div class='flash'>")
-      .text(type)
-      .addClass(type)
-      .appendTo('.js-flash-wrapper');
+
+    if (!$('.flash.' + type).is('*')) {
+      flash = $("<div class='flash'>")
+        .text(type)
+        .addClass(type)
+        .appendTo('.js-flash-wrapper')
+        .on('click', function() {
+          $(this).remove();
+        });
+    }
   });
 </script>