diff --git a/ts/components/SessionWrapperModal.tsx b/ts/components/SessionWrapperModal.tsx
index f69d66c4d..42753784e 100644
--- a/ts/components/SessionWrapperModal.tsx
+++ b/ts/components/SessionWrapperModal.tsx
@@ -63,15 +63,12 @@ export const SessionWrapperModal = (props: SessionWrapperModalType) => {
     }
   };
 
-  const fallbackFocusId = 'session-wrapper-modal';
-
   return (
-    <FocusTrap focusTrapOptions={{ fallbackFocus: `#${fallbackFocusId}`, allowOutsideClick: true }}>
+    <FocusTrap focusTrapOptions={{ initialFocus: false, allowOutsideClick: true }}>
       <div
         className={classNames('loki-dialog modal', additionalClassName || null)}
         onClick={handleClick}
         role="dialog"
-        id={fallbackFocusId}
       >
         <div className="session-confirm-wrapper">
           <div ref={modalRef} className="session-modal">
diff --git a/ts/components/conversation/header/ConversationHeaderSelectionOverlay.tsx b/ts/components/conversation/header/ConversationHeaderSelectionOverlay.tsx
index 66032e816..663081eae 100644
--- a/ts/components/conversation/header/ConversationHeaderSelectionOverlay.tsx
+++ b/ts/components/conversation/header/ConversationHeaderSelectionOverlay.tsx
@@ -69,7 +69,7 @@ export const SelectionOverlay = () => {
   const classNameAndId = 'message-selection-overlay';
 
   return (
-    <FocusTrap focusTrapOptions={{ fallbackFocus: `#${classNameAndId}`, allowOutsideClick: true }}>
+    <FocusTrap focusTrapOptions={{ initialFocus: false, allowOutsideClick: true }}>
       <div className={classNameAndId} id={classNameAndId}>
         <div className="close-button">
           <SessionIconButton iconType="exit" iconSize="medium" onClick={onCloseOverlay} />
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 563ec03f0..cc80b5758 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-restricted-syntax */
 import { createSelector } from '@reduxjs/toolkit';
-import { filter, first, isEmpty, isFinite, isNumber, pick, sortBy, toNumber } from 'lodash';
+import { filter, isEmpty, isFinite, isNumber, pick, sortBy, toNumber } from 'lodash';
 
 import {
   ConversationLookupType,
@@ -596,8 +596,7 @@ export const getMostRecentMessageId = (state: StateType): string | null => {
 export const getMostRecentOutgoingMessageId = createSelector(
   getSortedMessagesOfSelectedConversation,
   (messages: Array<MessageModelPropsWithoutConvoProps>): string | undefined => {
-    return first(messages.filter(m => m.propsForMessage.direction === 'outgoing'))?.propsForMessage
-      .id;
+    return messages.find(m => m.propsForMessage.direction === 'outgoing')?.propsForMessage.id;
   }
 );