diff --git a/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs
index c27eec45a43..76753b8b442 100644
--- a/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs
@@ -13,7 +13,7 @@
   {{#if this.noResults}}
     <p>{{i18n "choose_topic.none_found"}}</p>
   {{else}}
-    <div class="choose-topic-list">
+    <div class="choose-topic-list" role="radiogroup">
       {{#each this.topics as |t|}}
         <div class="controls existing-topic">
           <label class="radio">
diff --git a/app/assets/javascripts/discourse/app/templates/modal/feature-topic-on-profile.hbs b/app/assets/javascripts/discourse/app/templates/modal/feature-topic-on-profile.hbs
index 2652b139c8b..698250e7901 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/feature-topic-on-profile.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/feature-topic-on-profile.hbs
@@ -4,4 +4,5 @@
 
 <div class="modal-footer">
   <DButton @action={{action "save"}} @class="btn-primary save-featured-topic-on-profile" @disabled={{this.noTopicSelected}} @label="user.feature_topic_on_profile.save" />
+  <DButton @action={{route-action "closeModal" }} @label="cancel" @class="btn-flat" />
 </div>