diff --git a/phpBB/styles/script.js b/phpBB/styles/script.js
index d17a2cdc10..54248cc31c 100644
--- a/phpBB/styles/script.js
+++ b/phpBB/styles/script.js
@@ -69,6 +69,14 @@ phpbb.alert = function(title, msg, fadedark) {
 		});
 		return false;
 	});
+	
+	$(document).bind('keydown', function(e) {
+		if (e.keyCode === 13 || e.keyCode === 27) {
+			$(dark).trigger('click');
+			return false;
+		}
+		return true;
+	});
 
 	if (loading_alert.is(':visible'))
 	{
@@ -118,6 +126,17 @@ phpbb.confirm = function(msg, callback, fadedark) {
 		return false;
 	});
 	
+	$(document).bind('keydown', function(e) {
+		if (e.keyCode === 13) {
+			$('.jalertbut.button1').trigger('click');
+			return false;
+		} else if (e.keyCode === 27) {
+			$('.jalertbut.button2').trigger('click');
+			return false;
+		}
+		return true;
+	});
+	
 	if (loading_alert.is(':visible'))
 	{
 		loading_alert.fadeOut(function() {