diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 5fd5f42f78..9405a26ab2 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -560,6 +560,12 @@ export default createReactClass({
                     handled = true;
                 }
                 break;
+
+            case Key.ESCAPE:
+                this._messagePanel.forgetReadMarker();
+                this.jumpToLiveTimeline();
+                handled = true;
+                break;
         }
 
         if (handled) {