diff --git a/src/rails.js b/src/rails.js
index 4659b03c..eceb7ee6 100644
--- a/src/rails.js
+++ b/src/rails.js
@@ -184,7 +184,7 @@
     disableFormElements: function(form) {
       form.find(rails.disableSelector).each(function() {
         var element = $(this), method = element.is('button') ? 'html' : 'val';
-        element.data('ujs:enable-with', element[method]());
+        if (!element.data('ujs:enable-with')) element.data('ujs:enable-with', element[method]());
         element[method](element.data('disable-with'));
         element.prop('disabled', true);
       });
@@ -197,7 +197,10 @@
     enableFormElements: function(form) {
       form.find(rails.enableSelector).each(function() {
         var element = $(this), method = element.is('button') ? 'html' : 'val';
-        if (element.data('ujs:enable-with')) element[method](element.data('ujs:enable-with'));
+        if (element.data('ujs:enable-with')){
+            element[method](element.data('ujs:enable-with'));
+            element.data('ujs:enable-with', null);
+        }
         element.prop('disabled', false);
       });
     },