diff --git a/js/makegrid.js b/js/makegrid.js
index 5651453f14..6599672bf7 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -977,9 +977,14 @@
                                 'submit_type' : 'save'
                               };
                 
-                $(g.cEdit).find('*').attr('disabled', true);
-                var $editArea = $(g.cEdit).find('.edit_area');
-                $editArea.addClass('edit_area_posting');
+                if (!g.saveCellsAtOnce) {
+                    $(g.cEdit).find('*').attr('disabled', true);
+                    var $editArea = $(g.cEdit).find('.edit_area');
+                    $editArea.addClass('edit_area_posting');
+                } else {
+                    $('.save_edited').addClass('saving_edited_data')
+                        .attr('disabled', true);
+                }
                 
                 $.ajax({
                     type: 'POST',
@@ -987,7 +992,12 @@
                     data: post_params,
                     success:
                         function(data) {
-                            $editArea.removeClass('edit_area_posting');
+                            if (!g.saveCellsAtOnce) {
+                                $editArea.removeClass('edit_area_posting');
+                            } else {
+                                $('.save_edited').removeClass('saving_edited_data')
+                                    .attr('disabled', false);
+                            }
                             if(data.success == true) {
                                 PMA_ajaxShowMessage(data.message);
                                 $('.to_be_saved').each(function() {
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index bf3b2b8429..ec1d8fc89f 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -2505,3 +2505,8 @@ span.mysql-number {
     padding: 0.2em 0.3em;
 }
 
+.saving_edited_data {
+    background: url(./themes/pmahomme/img/ajax_clock_small.gif) no-repeat left;
+    padding-left: 20px;
+}
+
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 4e51172ad7..f1a3872da1 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -2944,3 +2944,8 @@ span.mysql-number {
     padding: 0.2em 0.3em;
 }
 
+.saving_edited_data {
+    background: url(./themes/pmahomme/img/ajax_clock_small.gif) no-repeat left;
+    padding-left: 20px;
+}
+