diff --git a/frappe/core/page/data_import_tool/importer.py b/frappe/core/page/data_import_tool/importer.py
index 363fcc2c47..ea0292644d 100644
--- a/frappe/core/page/data_import_tool/importer.py
+++ b/frappe/core/page/data_import_tool/importer.py
@@ -114,7 +114,7 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False,
 									d[fieldname] = getdate(parse_date(d[fieldname])) if d[fieldname] else None
 								elif fieldtype == "Datetime":
 									if d[fieldname]:
-										_date, _time = d[fieldname].split(" ")
+										_date, _time = d[fieldname].split()
 										_date = parse_date(d[fieldname])
 										d[fieldname] = get_datetime(_date + " " + _time)
 									else:
diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index aed3ce6668..66ebc280cc 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -260,12 +260,24 @@ frappe.Application = Class.extend({
 				return false;
 			})
 			.keydown("esc", function(e) {
+				// close open grid row
 				var open_row = $(".grid-row-open");
 				if(open_row.length) {
 					var grid_row = open_row.data("grid_row");
 					grid_row.toggle_view(false);
+					return false;
+				}
+
+				// close open dialog
+				if(cur_dialog && !cur_dialog.no_cancel_flag) {
+					cur_dialog.cancel();
+					return false;
+				}
+			})
+			.keydown("return", function() {
+				if(cur_dialog && cur_dialog.confirm_dialog) {
+					cur_dialog.get_primary_btn().trigger('click');
 				}
-				return false;
 			})
 			.keydown("ctrl+down meta+down", function(e) {
 				var open_row = $(".grid-row-open");
@@ -383,7 +395,7 @@ frappe.get_desktop_icons = function(show_hidden) {
 		if(out && !show_hidden) {
 			if(m.hidden) out = false;
 		}
-		
+
 		return out;
 	}
 
diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js
index 496d997634..81f95aa043 100644
--- a/frappe/public/js/frappe/ui/dialog.js
+++ b/frappe/public/js/frappe/ui/dialog.js
@@ -114,9 +114,3 @@ frappe.ui.Dialog = frappe.ui.FieldGroup.extend({
 	}
 });
 
-// close open dialogs on ESC
-$(document).bind('keydown', function(e) {
-	if(cur_dialog && !cur_dialog.no_cancel_flag && e.which==27) {
-		cur_dialog.cancel();
-	}
-});
diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js
index 744629c548..0a67e6d717 100644
--- a/frappe/public/js/frappe/ui/messages.js
+++ b/frappe/public/js/frappe/ui/messages.js
@@ -26,13 +26,16 @@ frappe.confirm = function(message, ifyes, ifno) {
 		],
 		primary_action_label: __("Yes"),
 		primary_action: function() {
-			ifyes();
+			if(ifyes) ifyes();
 			d.hide();
 		},
 		secondary_action_label: __("No")
 	});
 	d.show();
 
+	// flag, used to bind "okay" on enter
+	d.confirm_dialog = true;
+
 	// no if closed without primary action
 	if(ifno) {
 		d.onhide = function() {