diff --git a/src/main/webapp/scripts/facets/list-facet.js b/src/main/webapp/scripts/facets/list-facet.js
index 374e6c193..3381f19d2 100644
--- a/src/main/webapp/scripts/facets/list-facet.js
+++ b/src/main/webapp/scripts/facets/list-facet.js
@@ -309,10 +309,12 @@ ListFacet.prototype._editChoice = function(choice, choiceDiv) {
     elmts.textarea
         .text(originalContent)
         .keydown(function(evt) {
-            if (evt.keyCode == 13) {
-                commit();
-            } else if (evt.keyCode == 27) {
-                MenuSystem.dismissAll();
+            if (!evt.shiftKey) {
+                if (evt.keyCode == 13) {
+                    commit();
+                } else if (evt.keyCode == 27) {
+                    MenuSystem.dismissAll();
+                }
             }
         })
         .select()
diff --git a/src/main/webapp/scripts/views/data-table-cell-ui.js b/src/main/webapp/scripts/views/data-table-cell-ui.js
index a23e1bbe2..ac150f57b 100644
--- a/src/main/webapp/scripts/views/data-table-cell-ui.js
+++ b/src/main/webapp/scripts/views/data-table-cell-ui.js
@@ -396,13 +396,15 @@ DataTableCellUI.prototype._startEdit = function(elmt) {
     elmts.textarea
         .text(originalContent)
         .keydown(function(evt) {
-            if (evt.keyCode == 13) {
-                if (evt.ctrlKey) {
-                    elmts.applyOthersCheckbox[0].checked = true;
+            if (!evt.shiftKey) {
+                if (evt.keyCode == 13) {
+                    if (evt.ctrlKey) {
+                        elmts.applyOthersCheckbox[0].checked = true;
+                    }
+                    commit();
+                } else if (evt.keyCode == 27) {
+                    MenuSystem.dismissAll();
                 }
-                commit();
-            } else if (evt.keyCode == 27) {
-                MenuSystem.dismissAll();
             }
         })
         .select()