diff --git a/webapp/channels/src/components/post/post_component.tsx b/webapp/channels/src/components/post/post_component.tsx
index 3c037451eb02..ad7785b73eaf 100644
--- a/webapp/channels/src/components/post/post_component.tsx
+++ b/webapp/channels/src/components/post/post_component.tsx
@@ -521,7 +521,6 @@ const PostComponent = (props: Props): JSX.Element => {
                 ref={postRef}
                 id={getTestId()}
                 data-testid={postAriaLabelDivTestId}
-                tabIndex={0}
                 post={post}
                 className={getClassName()}
                 onClick={handlePostClick}
diff --git a/webapp/channels/src/components/post_edit_history/__snapshots__/post_edit_history.test.tsx.snap b/webapp/channels/src/components/post_edit_history/__snapshots__/post_edit_history.test.tsx.snap
index ee3cebfb7ced..71debed9af2a 100644
--- a/webapp/channels/src/components/post_edit_history/__snapshots__/post_edit_history.test.tsx.snap
+++ b/webapp/channels/src/components/post_edit_history/__snapshots__/post_edit_history.test.tsx.snap
@@ -255,7 +255,6 @@ exports[`components/post_edit_history should match snapshot 1`] = `
                         class="post-message__text"
                         dir="auto"
                         id="rhsPostMessageText_post_id"
-                        tabindex="0"
                       >
                         <p>
                           post message
diff --git a/webapp/channels/src/components/post_view/post_message_view/__snapshots__/post_message_view.test.tsx.snap b/webapp/channels/src/components/post_view/post_message_view/__snapshots__/post_message_view.test.tsx.snap
index 5963c0e57651..bb9b00a13a2a 100644
--- a/webapp/channels/src/components/post_view/post_message_view/__snapshots__/post_message_view.test.tsx.snap
+++ b/webapp/channels/src/components/post_view/post_message_view/__snapshots__/post_message_view.test.tsx.snap
@@ -10,7 +10,6 @@ exports[`components/post_view/PostAttachment should match snapshot 1`] = `
     dir="auto"
     id="postMessageText_post_id"
     onClick={[Function]}
-    tabIndex={0}
   >
     <Connect(PostMarkdown)
       imageProps={
@@ -47,7 +46,6 @@ exports[`components/post_view/PostAttachment should match snapshot, on Show Less
     dir="auto"
     id="postMessageText_post_id"
     onClick={[Function]}
-    tabIndex={0}
   >
     <Connect(PostMarkdown)
       imageProps={
@@ -84,7 +82,6 @@ exports[`components/post_view/PostAttachment should match snapshot, on Show More
     dir="auto"
     id="postMessageText_post_id"
     onClick={[Function]}
-    tabIndex={0}
   >
     <Connect(PostMarkdown)
       imageProps={
@@ -139,7 +136,6 @@ exports[`components/post_view/PostAttachment should match snapshot, on edited po
     dir="auto"
     id="postMessageText_post_id"
     onClick={[Function]}
-    tabIndex={0}
   >
     <Connect(PostMarkdown)
       imageProps={
@@ -177,7 +173,6 @@ exports[`components/post_view/PostAttachment should match snapshot, on ephemeral
     dir="auto"
     id="postMessageText_post_id"
     onClick={[Function]}
-    tabIndex={0}
   >
     <Connect(PostMarkdown)
       imageProps={
diff --git a/webapp/channels/src/components/post_view/post_message_view/post_message_view.tsx b/webapp/channels/src/components/post_view/post_message_view/post_message_view.tsx
index 153e8f787fc7..2d60524c64e6 100644
--- a/webapp/channels/src/components/post_view/post_message_view/post_message_view.tsx
+++ b/webapp/channels/src/components/post_view/post_message_view/post_message_view.tsx
@@ -146,7 +146,6 @@ export default class PostMessageView extends React.PureComponent<Props, State> {
                 maxHeight={maxHeight}
             >
                 <div
-                    tabIndex={0}
                     id={id}
                     className='post-message__text'
                     dir='auto'
diff --git a/webapp/channels/src/plugins/test/__snapshots__/post_type.test.tsx.snap b/webapp/channels/src/plugins/test/__snapshots__/post_type.test.tsx.snap
index 482993c8ffec..c5d4ac85178e 100644
--- a/webapp/channels/src/plugins/test/__snapshots__/post_type.test.tsx.snap
+++ b/webapp/channels/src/plugins/test/__snapshots__/post_type.test.tsx.snap
@@ -125,7 +125,6 @@ exports[`plugins/PostMessageView should match snapshot with no extended post typ
     dir="auto"
     id="postMessageText_post_id"
     onClick={[Function]}
-    tabIndex={0}
   >
     <Connect(PostMarkdown)
       imageProps={
diff --git a/webapp/platform/components/src/generic_modal/__snapshots__/generic_modal.test.tsx.snap b/webapp/platform/components/src/generic_modal/__snapshots__/generic_modal.test.tsx.snap
index 83e41d8c6b91..78b4f1b05649 100644
--- a/webapp/platform/components/src/generic_modal/__snapshots__/generic_modal.test.tsx.snap
+++ b/webapp/platform/components/src/generic_modal/__snapshots__/generic_modal.test.tsx.snap
@@ -11,7 +11,7 @@ exports[`GenericModal should match snapshot for base case 1`] = `
       aria-hidden="true"
     />
     <div
-      role="dialog"
+      role="none"
     >
       <div
         class="fade modal-backdrop in"