diff --git a/app/stacks/MasterDetailStack/index.tsx b/app/stacks/MasterDetailStack/index.tsx
index f3d552240c..dd1f051e22 100644
--- a/app/stacks/MasterDetailStack/index.tsx
+++ b/app/stacks/MasterDetailStack/index.tsx
@@ -21,6 +21,7 @@ import MessagesView from '../../views/MessagesView';
 import AutoTranslateView from '../../views/AutoTranslateView';
 import DirectoryView from '../../views/DirectoryView';
 import NotificationPrefView from '../../views/NotificationPreferencesView';
+import E2EEToggleRoomView from '../../views/E2EEToggleRoomView';
 import PushTroubleshootView from '../../views/PushTroubleshootView';
 import ForwardLivechatView from '../../views/ForwardLivechatView';
 import ForwardMessageView from '../../views/ForwardMessageView';
@@ -141,6 +142,7 @@ const ModalStackNavigator = React.memo(({ navigation }: INavigation) => {
 				/>
 				<ModalStack.Screen name='QueueListView' component={QueueListView} />
 				<ModalStack.Screen name='NotificationPrefView' component={NotificationPrefView} />
+				<ModalStack.Screen name='E2EEToggleRoomView' component={E2EEToggleRoomView} />
 				<ModalStack.Screen name='ForwardMessageView' component={ForwardMessageView} />
 				{/* @ts-ignore */}
 				<ModalStack.Screen name='ForwardLivechatView' component={ForwardLivechatView} />
diff --git a/app/stacks/MasterDetailStack/types.ts b/app/stacks/MasterDetailStack/types.ts
index f6d5c41a05..232f9e2d2b 100644
--- a/app/stacks/MasterDetailStack/types.ts
+++ b/app/stacks/MasterDetailStack/types.ts
@@ -117,6 +117,9 @@ export type ModalStackParamList = {
 		rid: string;
 		room: ISubscription;
 	};
+	E2EEToggleRoomView: {
+		rid: string;
+	};
 	ForwardMessageView: {
 		message: TAnyMessageModel;
 	};
diff --git a/app/views/RoomView/RightButtons.tsx b/app/views/RoomView/RightButtons.tsx
index f3fbfad907..83c496b9cb 100644
--- a/app/views/RoomView/RightButtons.tsx
+++ b/app/views/RoomView/RightButtons.tsx
@@ -396,16 +396,16 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
 		if (!rid) {
 			return;
 		}
-		// if (isMasterDetail) {
-		// 	// @ts-ignore TODO: find a way to make this work
-		// 	navigation.navigate('ModalStackNavigator', {
-		// 		screen: 'SearchMessagesView',
-		// 		params: { rid, showCloseModal: true, encrypted }
-		// 	});
-		// } else {
-		// @ts-ignore
-		navigation.navigate('E2EEToggleRoomView', { rid });
-		// }
+		if (isMasterDetail) {
+			// @ts-ignore TODO: find a way to make this work
+			navigation.navigate('ModalStackNavigator', {
+				screen: 'E2EEToggleRoomView',
+				params: { rid }
+			});
+		} else {
+			// @ts-ignore
+			navigation.navigate('E2EEToggleRoomView', { rid });
+		}
 	};
 
 	toggleFollowThread = () => {