diff --git a/app/assets/javascripts/prevent_double_submission.js.coffee b/app/assets/javascripts/prevent_double_submission.js.coffee
index 713706717..867e6fa43 100644
--- a/app/assets/javascripts/prevent_double_submission.js.coffee
+++ b/app/assets/javascripts/prevent_double_submission.js.coffee
@@ -16,10 +16,10 @@ App.PreventDoubleSubmission =
 
   initialize: ->
     $('form').on('submit', event, ->
-      button = $(this).find('.button')
+      button = $(this).find(':button, :submit')
       App.PreventDoubleSubmission.disable_button(button)
     ).on('ajax:success', ->
-      button = $(this).find('.button')
+      button = $(this).find(':button, :submit')
       App.PreventDoubleSubmission.reset_button(button)
     )