diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index 2cddf944..a991a80f 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -16,8 +16,8 @@ module TodosHelper
       &block )
     apply_behavior 'form.edit_todo_form', make_remote_form(
       :method => :put, 
-      :before => "this.down('button.positive').startWaiting()",
-      :loaded => "this.down('button.positive').stopWaiting()",
+      :before => "todoSpinner = this.down('button.positive'); todoSpinner.startWaiting()",
+      :loaded => "todoSpinner.stopWaiting()",
       :condition => "!(this.down('button.positive').isWaiting())"),
       :prevent_default => true
   end