diff --git a/src/screens/Messages/components/MessageComposer.tsx b/src/screens/Messages/components/MessageComposer.tsx
index dd2197b247..c5976fb688 100644
--- a/src/screens/Messages/components/MessageComposer.tsx
+++ b/src/screens/Messages/components/MessageComposer.tsx
@@ -376,7 +376,7 @@ function ComposerContainer({children}: {children: React.ReactNode}) {
             web: [
               a.pt_xs,
               a.pl_lg,
-              a.pb_lg,
+              {paddingBottom: tokens.space.lg + bottomInset},
               // prevent overlap with the scrollbar, which looks ugly
               a.pr_sm, // sm + sm = lg
               {width: `calc(100% - ${tokens.space.sm}px)` as '100%'},
diff --git a/src/screens/Messages/components/MessagesList.tsx b/src/screens/Messages/components/MessagesList.tsx
index d549ffb904..1976e973a3 100644
--- a/src/screens/Messages/components/MessagesList.tsx
+++ b/src/screens/Messages/components/MessagesList.tsx
@@ -683,7 +683,7 @@ export function MessagesList({
             <KeyboardStickyView
               style={[a.absolute, a.bottom_0, a.left_0, a.right_0]}
               onLayout={onInputLayout}
-              minimumOffset={bottomInset}
+              minimumOffset={IS_WEB ? 0 : bottomInset}
               offset={{
                 closed: platform({
                   ios: tokens.space.lg, // hide bottom padding when closed