diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index 719fd1fa22..cc739e79d5 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -426,14 +426,11 @@ export default class GridRow {
 				var fieldtype = $(this).attr('data-fieldtype');
 
 				var move_up_down = function(base) {
-					if (in_list(['Text', 'Small Text'], fieldtype)) {
-						return;
+					if (in_list(['Text', 'Small Text', 'Code', 'Text Editor', 'HTML Editor'], fieldtype) && !e.altKey) {
+						return false;
 					}
 					if (field.autocomplete_open) {
-						return;
-					}
-					if (field.autocomplete_open) {
-						return;
+						return false;
 					}
 
 					base.toggle_editable_row();
@@ -441,7 +438,7 @@ export default class GridRow {
 					if (input) {
 						input.focus();
 					}
-
+					return true;
 				};
 
 				// TAB
@@ -467,14 +464,16 @@ export default class GridRow {
 				} else if (e.which === UP_ARROW) {
 					if (me.doc.idx > 1) {
 						var prev = me.grid.grid_rows[me.doc.idx-2];
-						move_up_down(prev);
-						return false;
+						if (move_up_down(prev)) {
+							return false;
+						}
 					}
 				} else if (e.which === DOWN_ARROW) {
 					if (me.doc.idx < values.length) {
 						var next = me.grid.grid_rows[me.doc.idx];
-						move_up_down(next);
-						return false;
+						if (move_up_down(next)) {
+							return false;
+						}
 					}
 				}
 
@@ -653,4 +652,4 @@ export default class GridRow {
 	toggle_editable(fieldname, editable) {
 		this.set_field_property(fieldname, 'read_only', editable ? 0 : 1);
 	}
-};
\ No newline at end of file
+};