diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 91d5e01f78..e941c6b1a8 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1614,7 +1614,7 @@ module.exports = React.createClass({
 
         let aux = null;
         if (this.state.forwardingMessage !== null) {
-            aux = <ForwardMessage onCancelClick={this.onCancelClick} collapsedRhs={this.props.collapsedRhs} content={this.state.forwardingMessage} />;
+            aux = <ForwardMessage onCancelClick={this.onCancelClick} currentRoomId={this.state.room.roomId} collapsedRhs={this.props.collapsedRhs} content={this.state.forwardingMessage} />;
         } else if (this.state.editingRoomSettings) {
             aux = <RoomSettings ref="room_settings" onSaveClick={this.onSettingsSaveClick} onCancelClick={this.onCancelClick} room={this.state.room} />;
         } else if (this.state.uploadingRoomSettings) {
diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
index 42e2465037..bb401dde69 100644
--- a/src/components/views/rooms/ForwardMessage.js
+++ b/src/components/views/rooms/ForwardMessage.js
@@ -25,6 +25,7 @@ module.exports = React.createClass({
     displayName: 'ForwardMessage',
 
     propTypes: {
+        currentRoomId: React.PropTypes.string.isRequired,
         content: React.PropTypes.object.isRequired,
 
         // true if RightPanel is collapsed
@@ -74,6 +75,7 @@ module.exports = React.createClass({
     onAction: function(payload) {
         if (payload.action === 'view_room') {
             MatrixClientPeg.get().sendMessage(payload.room_id, this.props.content);
+            if (this.props.currentRoomId === payload.room_id) this.props.onCancelClick();
         }
     },