diff --git a/src/components/TinyMCEEditor.jsx b/src/components/TinyMCEEditor.jsx
index 510adf17e..cde183286 100644
--- a/src/components/TinyMCEEditor.jsx
+++ b/src/components/TinyMCEEditor.jsx
@@ -152,6 +152,7 @@ const TinyMCEEditor = (props) => {
           relative_urls: false,
           default_link_target: '_blank',
           target_list: false,
+          placeholder: props.placeholder,
           images_upload_handler: uploadHandler,
           setup,
         }}
diff --git a/src/components/TopicStats.jsx b/src/components/TopicStats.jsx
index 23cc02ee8..b3d3f0bc4 100644
--- a/src/components/TopicStats.jsx
+++ b/src/components/TopicStats.jsx
@@ -39,7 +39,7 @@ const TopicStats = ({
           </Tooltip>
         )}
       >
-        <div className="d-flex align-items-center mr-3.5">
+        <div className="d-flex align-items-center mr-3.5" tabIndex={0}>
           <Icon src={PostOutline} className="icon-size mr-2" />
           {threadCounts?.discussion || 0}
         </div>
@@ -57,7 +57,7 @@ const TopicStats = ({
           </Tooltip>
         )}
       >
-        <div className="d-flex align-items-center mr-3.5">
+        <div className="d-flex align-items-center mr-3.5" tabIndex={0}>
           <Icon src={HelpOutline} className="icon-size mr-2" />
           {threadCounts?.question || 0}
         </div>
diff --git a/src/discussions/discussions-home/DiscussionsHome.jsx b/src/discussions/discussions-home/DiscussionsHome.jsx
index c46247ddc..413b1405d 100644
--- a/src/discussions/discussions-home/DiscussionsHome.jsx
+++ b/src/discussions/discussions-home/DiscussionsHome.jsx
@@ -82,7 +82,7 @@ const DiscussionsHome = () => {
     <Suspense fallback={(<Spinner />)}>
       <DiscussionContext.Provider value={discussionContextValue}>
         {!enableInContextSidebar && (<Header courseOrg={org} courseNumber={courseNumber} courseTitle={courseTitle} />)}
-        <main className="container-fluid d-flex flex-column p-0 w-100 font-size" id="main" tabIndex="-1">
+        <main className="container-fluid d-flex flex-column p-0 w-100 font-size" id="main-content" tabIndex="-1">
           {!enableInContextSidebar && <CourseTabsNavigation />}
           {(isEnrolled || !isUserLearner) && (
             <div
diff --git a/src/discussions/in-context-topics/topic/Topic.jsx b/src/discussions/in-context-topics/topic/Topic.jsx
index fb3d0caf9..f5e074bb4 100644
--- a/src/discussions/in-context-topics/topic/Topic.jsx
+++ b/src/discussions/in-context-topics/topic/Topic.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import classNames from 'classnames';
-import { Link, useParams } from 'react-router-dom';
+import { useNavigate, useParams } from 'react-router-dom';
 
 import { useIntl } from '@edx/frontend-platform/i18n';
 
@@ -11,6 +11,7 @@ import { Routes } from '../../../data/constants';
 import { discussionsPath } from '../../utils';
 import messages from '../messages';
 
+
 const Topic = ({
   topic,
   showDivider,
@@ -18,6 +19,7 @@ const Topic = ({
 }) => {
   const intl = useIntl();
   const { courseId } = useParams();
+  const navigate = useNavigate();
   const isSelected = (id) => window.location.pathname.includes(id);
   const topicUrl = discussionsPath(Routes.TOPICS.TOPIC, {
     courseId,
@@ -26,16 +28,25 @@ const Topic = ({
 
   return (
     <>
-      <Link
-        className={classNames('discussion-topic p-0 text-decoration-none text-primary-500', {
-          'border-light-400 border-bottom': showDivider,
-        })}
+      <div
+        className={classNames('discussion-topic p-0 text-decoration-none text-primary-500', { 'border-light-400 border-bottom': showDivider })}
         data-topic-id={topic.id}
-        to={topicUrl()}
-        onClick={() => isSelected(topic.id)}
+        onClick={() => {
+          isSelected(topic.id);
+          navigate(topicUrl());
+        }}
+        onKeyDown={(e) => {
+          if (e.key === 'Enter' || e.key === ' ') {
+            e.preventDefault();
+            isSelected(topic.id);
+            navigate(topicUrl());
+          }
+        }}
         aria-current={isSelected(topic.id) ? 'page' : undefined}
+        aria-selected={isSelected(topic.id)}
         role="option"
         tabIndex={(isSelected(topic.id) || index === 0) ? 0 : -1}
+        style={{ cursor: 'pointer' }}
       >
         <div className="d-flex flex-row pt-2.5 pb-2 px-4">
           <div className="d-flex flex-column flex-fill" style={{ minWidth: 0 }}>
@@ -47,7 +58,7 @@ const Topic = ({
             <TopicStats threadCounts={topic?.threadCounts} />
           </div>
         </div>
-      </Link>
+      </div>
       {!showDivider && (
         <>
           <div className="divider border-top border-light-500" />