diff --git a/app/stacks/InsideStack.js b/app/stacks/InsideStack.js
index 18517368c..83fc22240 100644
--- a/app/stacks/InsideStack.js
+++ b/app/stacks/InsideStack.js
@@ -182,6 +182,11 @@ const ChatsStackNavigator = () => {
 				component={TeamChannelsView}
 				options={TeamChannelsView.navigationOptions}
 			/>
+			<ChatsStack.Screen
+				name='CreateChannelView'
+				component={CreateChannelView}
+				options={CreateChannelView.navigationOptions}
+			/>
 			<ChatsStack.Screen
 				name='AddChannelTeamView'
 				component={AddChannelTeamView}
diff --git a/app/views/AddChannelTeamView.js b/app/views/AddChannelTeamView.js
index 229e00457..fdb166caf 100644
--- a/app/views/AddChannelTeamView.js
+++ b/app/views/AddChannelTeamView.js
@@ -38,7 +38,10 @@ const AddChannelTeamView = ({
 				<List.Separator />
 				<List.Item
 					title='Create_New'
-					onPress={() => navigation.navigate('NewMessageStackNavigator', { screen: 'SelectedUsersViewCreateChannel', params: { nextAction: () => navigation.navigate('CreateChannelView', { teamId }) } })}
+					onPress={() => (isMasterDetail
+						? navigation.navigate('SelectedUsersViewCreateChannel', { nextAction: () => navigation.navigate('CreateChannelView', { teamId }) })
+						: navigation.navigate('SelectedUsersView', { nextAction: () => navigation.navigate('ChatsStackNavigator', { screen: 'CreateChannelView', params: { teamId } }) }))
+					}
 					testID='add-channel-team-view-create-channel'
 					left={() => <List.Icon name='team' />}
 					right={() => <List.Icon name='chevron-right' />}