diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 6e2f0a3a5b..ef9d8d112a 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -106,6 +106,17 @@ export default React.createClass({
         var handled = false;
 
         switch (ev.keyCode) {
+            case KeyCode.ESCAPE:
+
+                // Implemented this way so possible handling for other pages is neater
+                switch (this.props.page_type) {
+                    case PageTypes.UserSettings:
+                        this.props.onUserSettingsClose();
+                        handled = true;
+                        break;
+                }
+
+                break;
             case KeyCode.UP:
             case KeyCode.DOWN:
                 if (ev.altKey) {