diff --git a/react/features/base/modal/components/JitsiKeyboardAvoidingView.js b/react/features/base/modal/components/JitsiKeyboardAvoidingView.js
index 98d5ed36b..d77f4b62e 100644
--- a/react/features/base/modal/components/JitsiKeyboardAvoidingView.js
+++ b/react/features/base/modal/components/JitsiKeyboardAvoidingView.js
@@ -3,10 +3,8 @@
 import { useHeaderHeight } from '@react-navigation/stack';
 import React, { useEffect, useState } from 'react';
 import {
-    Keyboard,
     KeyboardAvoidingView,
-    Platform,
-    TouchableWithoutFeedback
+    Platform
 } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
@@ -60,22 +58,18 @@ const JitsiKeyboardAvoidingView = (
     const androidVerticalOffset = headerHeight;
 
     return (
-        <TouchableWithoutFeedback
-            /* eslint-disable-next-line react/jsx-handler-names */
-            onPress = { Keyboard.dismiss }>
-            <KeyboardAvoidingView
-                behavior = { Platform.OS === 'ios' ? 'padding' : 'height' }
-                contentContainerStyle = { contentContainerStyle }
-                enabled = { true }
-                keyboardVerticalOffset = {
-                    Platform.OS === 'ios'
-                        ? iosVerticalOffset
-                        : androidVerticalOffset
-                }
-                style = { style }>
-                { children }
-            </KeyboardAvoidingView>
-        </TouchableWithoutFeedback>
+        <KeyboardAvoidingView
+            behavior = { Platform.OS === 'ios' ? 'padding' : 'height' }
+            contentContainerStyle = { contentContainerStyle }
+            enabled = { true }
+            keyboardVerticalOffset = {
+                Platform.OS === 'ios'
+                    ? iosVerticalOffset
+                    : androidVerticalOffset
+            }
+            style = { style }>
+            { children }
+        </KeyboardAvoidingView>
     );
 };
 
diff --git a/react/features/chat/components/native/MessageContainer.js b/react/features/chat/components/native/MessageContainer.js
index 8cc17d4bc..1254fec75 100644
--- a/react/features/chat/components/native/MessageContainer.js
+++ b/react/features/chat/components/native/MessageContainer.js
@@ -2,7 +2,6 @@
 
 import React from 'react';
 import { FlatList, Text, View } from 'react-native';
-import { ScrollView } from 'react-native-gesture-handler';
 
 import { ColorSchemeRegistry } from '../../../base/color-scheme';
 import { translate } from '../../../base/i18n';
@@ -62,7 +61,7 @@ class MessageContainer extends AbstractMessageContainer<Props> {
                 // https://github.com/facebook/react-native/issues/21196
                 inverted = { Boolean(data.length) }
                 keyExtractor = { this._keyExtractor }
-                keyboardShouldPersistTaps = 'always'
+                keyboardShouldPersistTaps = 'handled'
                 renderItem = { this._renderMessageGroup } />
         );
     }
@@ -111,11 +110,7 @@ class MessageContainer extends AbstractMessageContainer<Props> {
      * @returns {React$Element<*>}
      */
     _renderMessageGroup({ item: messages }) {
-        return (
-            <ScrollView>
-                <ChatMessageGroup messages = { messages } />
-            </ScrollView>
-        );
+        return <ChatMessageGroup messages = { messages } />;
     }
 }