diff --git a/app/containers/MessageActions/index.js b/app/containers/MessageActions/index.js
index afed3f487..7846e1d70 100644
--- a/app/containers/MessageActions/index.js
+++ b/app/containers/MessageActions/index.js
@@ -117,7 +117,12 @@ const MessageActions = React.memo(forwardRef(({
 	const handleEdit = message => editInit(message);
 
 	const handleCreateDiscussion = (message) => {
-		Navigation.navigate('CreateDiscussionView', { message, channel: room });
+		const params = { message, channel: room, showCloseModal: true };
+		if (isMasterDetail) {
+			Navigation.navigate('ModalStackNavigator', { screen: 'CreateDiscussionView', params });
+		} else {
+			Navigation.navigate('NewMessageStackNavigator', { screen: 'CreateDiscussionView', params });
+		}
 	};
 
 	const handleUnread = async(message) => {