diff --git a/app/assets/javascripts/discourse/app/components/search-menu/results/type/topic.hbs b/app/assets/javascripts/discourse/app/components/search-menu/results/type/topic.hbs
index 05d61201399..cb7a4336dc6 100644
--- a/app/assets/javascripts/discourse/app/components/search-menu/results/type/topic.hbs
+++ b/app/assets/javascripts/discourse/app/components/search-menu/results/type/topic.hbs
@@ -8,9 +8,13 @@
           @result.topic_title_headline
         )
       }}
-        <span>{{replace-emoji (html-safe @result.topic_title_headline)}}</span>
+        <a href={{if @withTopicUrl @result.url}}>
+          {{replace-emoji (html-safe @result.topic_title_headline)}}
+        </a>
       {{else}}
-        <SearchMenu::HighlightedSearch @string={{@result.topic.fancyTitle}} />
+        <a href={{if @withTopicUrl @result.url}}>
+          <SearchMenu::HighlightedSearch @string={{@result.topic.fancyTitle}} />
+        </a>
       {{/if}}
       <PluginOutlet
         @name="search-menu-results-topic-title-suffix"
@@ -19,7 +23,7 @@
     </span>
   </span>
   <span class="second-line">
-    {{category-link @result.topic.category link=false}}
+    {{category-link @result.topic.category link=(if @withTopicUrl true false)}}
     {{#if this.siteSettings.tagging_enabled}}
       {{discourse-tags @result.topic tagName="span"}}
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs b/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs
index 82bd0f320bb..373d6bfafd9 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs
@@ -5,7 +5,10 @@
 <ul class="topics">
   {{#each this.message.similarTopics as |topic|}}
     <div class="similar-topic">
-      <SearchMenu::Results::Type::Topic @result={{topic}} />
+      <SearchMenu::Results::Type::Topic
+        @result={{topic}}
+        @withTopicUrl={{true}}
+      />
     </div>
   {{/each}}
 </ul>
\ No newline at end of file