diff --git a/stylesheets/components/Lightbox.scss b/stylesheets/components/Lightbox.scss
index 10376657df..ebcd97637e 100644
--- a/stylesheets/components/Lightbox.scss
+++ b/stylesheets/components/Lightbox.scss
@@ -332,8 +332,10 @@
       width: 100%;
     }
 
-    &:focus {
-      outline: 4px solid variables.$color-ultramarine;
+    @include mixins.keyboard-mode {
+      &:focus {
+        outline: 4px solid variables.$color-ultramarine;
+      }
     }
 
     &:disabled {
diff --git a/ts/components/Lightbox.dom.tsx b/ts/components/Lightbox.dom.tsx
index 9a9297c823..08ed9e3c4f 100644
--- a/ts/components/Lightbox.dom.tsx
+++ b/ts/components/Lightbox.dom.tsx
@@ -729,11 +729,7 @@ export function Lightbox({
             role="presentation"
           >
             <div className="Lightbox__animated">
-              <div
-                className="Lightbox__main-container"
-                tabIndex={-1}
-                ref={focusRef}
-              >
+              <div className="Lightbox__main-container">
                 <div className="Lightbox__header">
                   {getConversation && currentItem != null ? (
                     <LightboxHeader
@@ -765,6 +761,7 @@ export function Lightbox({
                       aria-label={i18n('icu:close')}
                       className="Lightbox__button Lightbox__button--close"
                       onClick={closeLightbox}
+                      ref={focusRef}
                       type="button"
                     />
                   </div>
diff --git a/ts/components/conversation/Message.dom.tsx b/ts/components/conversation/Message.dom.tsx
index cf0b32c709..de0d487e3f 100644
--- a/ts/components/conversation/Message.dom.tsx
+++ b/ts/components/conversation/Message.dom.tsx
@@ -3309,6 +3309,7 @@ export class Message extends PureComponent<Props, State> {
       return;
     }
 
+    window.enterKeyboardMode();
     this.handleOpen(event);
   };
 
diff --git a/ts/hooks/useRestoreFocus.dom.ts b/ts/hooks/useRestoreFocus.dom.ts
index ed1f443a75..b1b7d5e2f7 100644
--- a/ts/hooks/useRestoreFocus.dom.ts
+++ b/ts/hooks/useRestoreFocus.dom.ts
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import { useRef, useCallback, useEffect } from 'react';
+import { clearTimeoutIfNecessary } from '../util/clearTimeoutIfNecessary.std.ts';
 
 type CallbackType = (toFocus: HTMLElement | null | undefined) => void;
 
@@ -9,11 +10,15 @@ type CallbackType = (toFocus: HTMLElement | null | undefined) => void;
 export const useRestoreFocus = (): [CallbackType] => {
   const toFocusRef = useRef<HTMLElement | null>(null);
   const lastFocusedRef = useRef<HTMLElement | null>(null);
+  const focusLastElementTimeoutRef =
+    useRef<ReturnType<typeof setTimeout>>(null);
 
   // We need to use a callback here because refs aren't necessarily populated on first
   //   render. For example, ModalHost makes a top-level parent div first, and then renders
   //   into it. And the children you pass it don't have access to that root div.
   const setFocusRef = useCallback((toFocus: HTMLElement | null | undefined) => {
+    clearTimeoutIfNecessary(focusLastElementTimeoutRef.current);
+
     if (!toFocus) {
       return;
     }
@@ -32,7 +37,7 @@ export const useRestoreFocus = (): [CallbackType] => {
   useEffect(() => {
     return () => {
       // On unmount, returned focus to element focused before we set the focus
-      setTimeout(() => {
+      focusLastElementTimeoutRef.current = setTimeout(() => {
         if (lastFocusedRef.current && lastFocusedRef.current.focus) {
           lastFocusedRef.current.focus();
         }