diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index 56f070ba36..cce628120c 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -52,6 +52,9 @@ export default class MessageContextMenu extends React.Component {
 
         /* callback called when the menu is dismissed */
         onFinished: PropTypes.func,
+
+        /* if the menu is inside a dialog, we sometimes need to close that dialog after click (forwarding) */
+        onCloseDialog: PropTypes.func,
     };
 
     state = {
@@ -194,6 +197,7 @@ export default class MessageContextMenu extends React.Component {
             action: 'forward_event',
             event: this.props.mxEvent,
         });
+        this.props.onCloseDialog();
         this.closeMenu();
     };
 
diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index d3be3c1d54..f39ac8ba19 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -224,6 +224,7 @@ export default class ImageView extends React.Component {
                         mxEvent={this.props.mxEvent}
                         permalinkCreator={this.props.permalinkCreator}
                         onFinished={this.onCloseContextMenu}
+                        onCloseDialog={this.props.onFinished}
                     />
                 </ContextMenu>
             );