diff --git a/app/helpers/modal_helper.rb b/app/helpers/modal_helper.rb
index b47c8b86..8c95bf9a 100644
--- a/app/helpers/modal_helper.rb
+++ b/app/helpers/modal_helper.rb
@@ -34,8 +34,7 @@ def modal_footer(options, &block)
   end
 
   def close_button(dismiss)
-    #It doesn't seem to like content_tag, so we do this instead.
-    raw("<button class=\"close\" data-dismiss=\"#{dismiss}\" aria-hidden=\"true\">&times;</button>")
+    content_tag :button, '&times;'.html_safe, { :class => 'close', "data-dismiss" => dismiss, "aria-hidden" => true }
   end
 
   def modal_toggle(content_or_options = nil, options, &block)