diff --git a/app/assets/javascripts/flash_messages.js b/app/assets/javascripts/flash_messages.js
index 3d473ad..443dd9f 100644
--- a/app/assets/javascripts/flash_messages.js
+++ b/app/assets/javascripts/flash_messages.js
@@ -32,3 +32,15 @@ function flashMessage(flashType, message) {
     $flashDiv.hide({effect: "fade", duration: 1000});
   }, 5000);
 }
+
+$(document).on("ready page:load", function() {
+  $("#flashHolder").find("div").each(function(idx, div) {
+    var $div = $(div);
+    var type = $div.attr("class");
+    var message = $div.html();
+
+    $div.remove();
+
+    flashMessage(type, message);
+  });
+});
\ No newline at end of file
diff --git a/app/assets/stylesheets/flash_messages.scss b/app/assets/stylesheets/flash_messages.scss
index 4c161a3..b1392f8 100644
--- a/app/assets/stylesheets/flash_messages.scss
+++ b/app/assets/stylesheets/flash_messages.scss
@@ -1,4 +1,8 @@
 
+#flashHolder {
+  display: none;
+}
+
 #flashContainer {
   position: fixed;
   width: 100%;
diff --git a/app/views/layouts/_flash_messages.html.erb b/app/views/layouts/_flash_messages.html.erb
index b145386..e4e8932 100644
--- a/app/views/layouts/_flash_messages.html.erb
+++ b/app/views/layouts/_flash_messages.html.erb
@@ -1,22 +1,10 @@
 <div id="flashContainer"></div>
 
-<% unless flash.empty? %>
+<div id="flashHolder">
+  <% flash.each do |type, values| %>
+    <% Array.wrap(values).each do |value| %>
+      <div class="<%= type %>"><%= value %></div>
+    <% end %>
+  <% end %>
+</div>
 
-  <script type="text/javascript">
-    $(document).on("ready page:load", function() {
-      <%=
-        calls = []
-        flash.each do |key, value|
-          if value.respond_to? 'each'
-            value.each { |sub_value| calls << "flashMessage('#{j(key.to_s)}', '#{j(sub_value.to_s)}');" }
-          else
-            calls << "flashMessage('#{j(key.to_s)}', '#{j(value.to_s)}');"
-          end
-        end
-
-        raw(calls.join('\n'))
-      %>
-    });
-  </script>
-
-<% end %>
\ No newline at end of file