diff --git a/js/functions.js b/js/functions.js
index bc3b2cb1e4..30ac8ddb6f 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -4292,7 +4292,10 @@ function PMA_getCellValue(td) {
     var $td = $(td);
     if ($td.is('.null')) {
         return '';
-    } else if (! $td.is('.to_be_saved') && $td.data('original_data')) {
+    } else if ((! $td.is('.to_be_saved')
+        || $td.is('.set'))
+        && $td.data('original_data')
+    ) {
         return $td.data('original_data');
     } else {
         return $td.text();
diff --git a/js/makegrid.js b/js/makegrid.js
index f41ef3b9e1..41819cdb5e 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -953,6 +953,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                         g.lastXHR = null;
                         $editArea.removeClass('edit_area_loading');
                         $editArea.append(data.select);
+                        $td.data('original_data', $(data.select).val().join());
                         $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
                     }); // end $.post()