diff --git a/client/dist/js/SMModal.js b/client/dist/js/SMModal.js
index e71c39b..45b15c3 100644
--- a/client/dist/js/SMModal.js
+++ b/client/dist/js/SMModal.js
@@ -17,7 +17,7 @@
         }
     };
 
-    $('.system-message').each(function() {
+    $('.system-message-modal').each(function() {
         DelayTime = $(this).attr('data-delay');
         $object = $(this);
         if (DelayTime > 0) {
diff --git a/templates/ilateral/SilverStripe/SystemMessages/SystemMessage.ss b/templates/ilateral/SilverStripe/SystemMessages/SystemMessage.ss
index baee177..6ad0cd4 100644
--- a/templates/ilateral/SilverStripe/SystemMessages/SystemMessage.ss
+++ b/templates/ilateral/SilverStripe/SystemMessages/SystemMessage.ss
@@ -17,7 +17,7 @@
                 </div>
             </div>
         <% else %>
-            <div class="modal fade system-message<% if not $UseBootstrap %> system-message-lightbox<% else %> system-message-bsmodal<% end_if %>" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" data-delay="$Delay">
+            <div class="modal fade system-message system-message-modal<% if not $UseBootstrap %> system-message-lightbox<% else %> system-message-bsmodal<% end_if %>" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" data-delay="$Delay">
                 <div class="modal-dialog" role="document">
                     <div class="modal-content system-message-content alert alert-$MessageType">
                         <div class="modal-body">