diff --git a/CHANGELOG.md b/CHANGELOG.md
index c20c667740..04818dc6a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,6 +60,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 -  Fixes [#5050](https://github.com/microsoft/BotFramework-WebChat/issues/5050). Fixed focus should not blur briefly after tapping on a suggested action, by [@compulim](https://github.com/compulim), in PR [#5097](https://github.com/microsoft/BotFramework-WebChat/issues/pull/5097)
 -  Fixes [#5111](https://github.com/microsoft/BotFramework-WebChat/issues/5111). Fixed keyboard help screen to use HTML description list, by [@compulim](https://github.com/compulim), in PR [#5116](https://github.com/microsoft/BotFramework-WebChat/issues/pull/5116)
 -  Fixes [#5080](https://github.com/microsoft/BotFramework-WebChat/issues/5080). Fixed `dateToLocaleISOString` for handling sub-hour, by [@marclundgren](https://github.com/marclundgren), in PR [#5114](https://github.com/microsoft/BotFramework-WebChat/pull/5114)
+-  Fixes [#5146](https://github.com/microsoft/BotFramework-WebChat/issues/5146). Fixed chat history focus indicator should not show up on tap, by [@OEvgeny](https://github.com/OEvgeny), in PR [#5145](https://github.com/microsoft/BotFramework-WebChat/pull/5145)
 
 ### Changed
 
diff --git a/__tests__/__image_snapshots__/html/accessibility-keyboard-help-click-thru-js-keyboard-help-screen-should-not-interfere-when-clicking-on-activities-4-snap.png b/__tests__/__image_snapshots__/html/accessibility-keyboard-help-click-thru-js-keyboard-help-screen-should-not-interfere-when-clicking-on-activities-4-snap.png
index 62aa135b03..abd7f32223 100644
Binary files a/__tests__/__image_snapshots__/html/accessibility-keyboard-help-click-thru-js-keyboard-help-screen-should-not-interfere-when-clicking-on-activities-4-snap.png and b/__tests__/__image_snapshots__/html/accessibility-keyboard-help-click-thru-js-keyboard-help-screen-should-not-interfere-when-clicking-on-activities-4-snap.png differ
diff --git a/__tests__/__image_snapshots__/html/scroll-to-end-button-customization-js-scroll-to-end-button-should-be-customizable-3-snap.png b/__tests__/__image_snapshots__/html/scroll-to-end-button-customization-js-scroll-to-end-button-should-be-customizable-3-snap.png
index 1954357626..296ea9c3a3 100644
Binary files a/__tests__/__image_snapshots__/html/scroll-to-end-button-customization-js-scroll-to-end-button-should-be-customizable-3-snap.png and b/__tests__/__image_snapshots__/html/scroll-to-end-button-customization-js-scroll-to-end-button-should-be-customizable-3-snap.png differ
diff --git a/__tests__/__image_snapshots__/html/scroll-to-end-button-customization-js-scroll-to-end-button-should-be-customizable-4-snap.png b/__tests__/__image_snapshots__/html/scroll-to-end-button-customization-js-scroll-to-end-button-should-be-customizable-4-snap.png
index 54a07a8782..1e8822cba2 100644
Binary files a/__tests__/__image_snapshots__/html/scroll-to-end-button-customization-js-scroll-to-end-button-should-be-customizable-4-snap.png and b/__tests__/__image_snapshots__/html/scroll-to-end-button-customization-js-scroll-to-end-button-should-be-customizable-4-snap.png differ
diff --git a/__tests__/__image_snapshots__/html/scroll-to-end-button-visibility-js-scroll-to-end-button-should-show-and-hide-properly-3-snap.png b/__tests__/__image_snapshots__/html/scroll-to-end-button-visibility-js-scroll-to-end-button-should-show-and-hide-properly-3-snap.png
index cc55db3b97..7036d9dd48 100644
Binary files a/__tests__/__image_snapshots__/html/scroll-to-end-button-visibility-js-scroll-to-end-button-should-show-and-hide-properly-3-snap.png and b/__tests__/__image_snapshots__/html/scroll-to-end-button-visibility-js-scroll-to-end-button-should-show-and-hide-properly-3-snap.png differ
diff --git a/__tests__/__image_snapshots__/html/scroll-to-end-button-visibility-js-scroll-to-end-button-should-show-and-hide-properly-4-snap.png b/__tests__/__image_snapshots__/html/scroll-to-end-button-visibility-js-scroll-to-end-button-should-show-and-hide-properly-4-snap.png
index 81f061d322..c8f71ff439 100644
Binary files a/__tests__/__image_snapshots__/html/scroll-to-end-button-visibility-js-scroll-to-end-button-should-show-and-hide-properly-4-snap.png and b/__tests__/__image_snapshots__/html/scroll-to-end-button-visibility-js-scroll-to-end-button-should-show-and-hide-properly-4-snap.png differ
diff --git a/__tests__/__image_snapshots__/html/transcript-navigation-focus-activity-by-click-js-transcript-navigation-should-focus-activity-by-click-1-snap.png b/__tests__/__image_snapshots__/html/transcript-navigation-focus-activity-by-click-js-transcript-navigation-should-focus-activity-by-click-1-snap.png
index cb09b48260..2c009a6221 100644
Binary files a/__tests__/__image_snapshots__/html/transcript-navigation-focus-activity-by-click-js-transcript-navigation-should-focus-activity-by-click-1-snap.png and b/__tests__/__image_snapshots__/html/transcript-navigation-focus-activity-by-click-js-transcript-navigation-should-focus-activity-by-click-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/html/transcript-navigation-focus-activity-by-click-js-transcript-navigation-should-focus-activity-by-click-2-snap.png b/__tests__/__image_snapshots__/html/transcript-navigation-focus-activity-by-click-js-transcript-navigation-should-focus-activity-by-click-2-snap.png
index f24a735e83..5c42ca8ac7 100644
Binary files a/__tests__/__image_snapshots__/html/transcript-navigation-focus-activity-by-click-js-transcript-navigation-should-focus-activity-by-click-2-snap.png and b/__tests__/__image_snapshots__/html/transcript-navigation-focus-activity-by-click-js-transcript-navigation-should-focus-activity-by-click-2-snap.png differ
diff --git a/__tests__/__image_snapshots__/html/transcript-navigation-focus-activity-scroll-into-view-mouse-js-transcript-navigation-should-not-scroll-into-view-after-clicking-1-snap.png b/__tests__/__image_snapshots__/html/transcript-navigation-focus-activity-scroll-into-view-mouse-js-transcript-navigation-should-not-scroll-into-view-after-clicking-1-snap.png
index cb09b48260..2c009a6221 100644
Binary files a/__tests__/__image_snapshots__/html/transcript-navigation-focus-activity-scroll-into-view-mouse-js-transcript-navigation-should-not-scroll-into-view-after-clicking-1-snap.png and b/__tests__/__image_snapshots__/html/transcript-navigation-focus-activity-scroll-into-view-mouse-js-transcript-navigation-should-not-scroll-into-view-after-clicking-1-snap.png differ
diff --git a/__tests__/__image_snapshots__/html/transcript-navigation-focus-activity-scroll-into-view-mouse-js-transcript-navigation-should-not-scroll-into-view-after-clicking-3-snap.png b/__tests__/__image_snapshots__/html/transcript-navigation-focus-activity-scroll-into-view-mouse-js-transcript-navigation-should-not-scroll-into-view-after-clicking-3-snap.png
index cb09b48260..2c009a6221 100644
Binary files a/__tests__/__image_snapshots__/html/transcript-navigation-focus-activity-scroll-into-view-mouse-js-transcript-navigation-should-not-scroll-into-view-after-clicking-3-snap.png and b/__tests__/__image_snapshots__/html/transcript-navigation-focus-activity-scroll-into-view-mouse-js-transcript-navigation-should-not-scroll-into-view-after-clicking-3-snap.png differ
diff --git a/__tests__/__image_snapshots__/html/transcript-navigation-scroll-into-view-mouse-js-transcript-navigation-when-focusing-on-transcript-using-mouse-should-not-scroll-focused-activity-into-view-3-snap.png b/__tests__/__image_snapshots__/html/transcript-navigation-scroll-into-view-mouse-js-transcript-navigation-when-focusing-on-transcript-using-mouse-should-not-scroll-focused-activity-into-view-3-snap.png
index be1a9b9fef..3aa2880004 100644
Binary files a/__tests__/__image_snapshots__/html/transcript-navigation-scroll-into-view-mouse-js-transcript-navigation-when-focusing-on-transcript-using-mouse-should-not-scroll-focused-activity-into-view-3-snap.png and b/__tests__/__image_snapshots__/html/transcript-navigation-scroll-into-view-mouse-js-transcript-navigation-when-focusing-on-transcript-using-mouse-should-not-scroll-focused-activity-into-view-3-snap.png differ
diff --git a/packages/component/src/Styles/StyleSet/BasicTranscript.ts b/packages/component/src/Styles/StyleSet/BasicTranscript.ts
index dc5b9567a0..0e63129a9c 100644
--- a/packages/component/src/Styles/StyleSet/BasicTranscript.ts
+++ b/packages/component/src/Styles/StyleSet/BasicTranscript.ts
@@ -39,7 +39,7 @@ export default function createBasicTranscriptStyleSet({
         }
       },
 
-      '&:focus .webchat__basic-transcript__focus-indicator, .webchat__basic-transcript__terminator:focus + .webchat__basic-transcript__focus-indicator':
+      '&:focus-visible .webchat__basic-transcript__focus-indicator, .webchat__basic-transcript__terminator:focus-visible + .webchat__basic-transcript__focus-indicator':
         {
           height: '100%',
           borderColor: transcriptVisualKeyboardIndicatorColor,