diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index d567a0ba9a..e7b8a687f5 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -59,8 +59,10 @@ export default React.createClass({
 
     // Don't let key down events get any further, so they only trigger this and nothing more
     _onKeyDown: function(e) {
-        e.stopPropagation();
-        e.preventDefault();
+        if (e.keyCode === KeyCode.ESCAPE) {
+            e.stopPropagation();
+            e.preventDefault();
+        }
     },
     
     // Must be when the key is released (and not pressed) otherwise componentWillUnmount