diff --git a/src/components/views/dialogs/ErrorDialog.js b/src/components/views/dialogs/ErrorDialog.js
index cc400e30a6..ed48f10fd7 100644
--- a/src/components/views/dialogs/ErrorDialog.js
+++ b/src/components/views/dialogs/ErrorDialog.js
@@ -49,9 +49,17 @@ module.exports = React.createClass({
         };
     },
 
+    onKeyDown: function(e) {
+        if (e.keyCode === 27) { // escape
+            e.stopPropagation();
+            e.preventDefault();
+            this.props.onFinished(false);
+        }
+    },
+
     render: function() {
         return (
-            <div className="mx_ErrorDialog">
+            <div className="mx_ErrorDialog" onKeyDown={ this.onKeyDown }>
                 <div className="mx_Dialog_title">
                     {this.props.title}
                 </div>
diff --git a/src/components/views/dialogs/QuestionDialog.js b/src/components/views/dialogs/QuestionDialog.js
index 602332e46d..1cd4d047fd 100644
--- a/src/components/views/dialogs/QuestionDialog.js
+++ b/src/components/views/dialogs/QuestionDialog.js
@@ -46,9 +46,22 @@ module.exports = React.createClass({
         this.props.onFinished(false);
     },
 
+    onKeyDown: function(e) {
+        if (e.keyCode === 27) { // escape
+            e.stopPropagation();
+            e.preventDefault();
+            this.props.onFinished(false);
+        }
+        else if (e.keyCode === 13) { // enter
+            e.stopPropagation();
+            e.preventDefault();
+            this.props.onFinished(true);
+        }
+    },
+
     render: function() {
         return (
-            <div className="mx_QuestionDialog">
+            <div className="mx_QuestionDialog" onKeyDown={ this.onKeyDown }>
                 <div className="mx_Dialog_title">
                     {this.props.title}
                 </div>