diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-list-item.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-list-item.hbs
index 8cbc45cec54..556c0177f92 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-list-item.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-list-item.hbs
@@ -1,7 +1 @@
 {{topicListItemContents}}
-
-{{plugin-outlet
-  name="after-topic-list-item"
-  args=(hash topic=topic)
-  index=index
-}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-list.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-list.hbs
index 8ebd8b22457..1f8575a5df2 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-list.hbs
@@ -46,6 +46,11 @@
                       focusLastVisitedTopic=focusLastVisitedTopic
                       index=index}}
     {{raw "list/visited-line" lastVisitedTopic=lastVisitedTopic topic=topic}}
+    {{plugin-outlet
+      name="after-topic-list-item"
+      args=(hash topic=topic index=index)
+      connectorTagName="tr"
+    }}
   {{/each}}
 </tbody>