diff --git a/lib/philomena_web/controllers/conversation_controller.ex b/lib/philomena_web/controllers/conversation_controller.ex
index 5bf87df7..08cde1c1 100644
--- a/lib/philomena_web/controllers/conversation_controller.ex
+++ b/lib/philomena_web/controllers/conversation_controller.ex
@@ -39,6 +39,6 @@ defmodule PhilomenaWeb.ConversationController do
     messages =
       %{messages | entries: Enum.zip(messages.entries, rendered)}
 
-    render(conn, "index.html", conversation: conversation, messages: messages)
+    render(conn, "show.html", conversation: conversation, messages: messages)
   end
 end
\ No newline at end of file
diff --git a/lib/philomena_web/templates/conversation/index.html.slime b/lib/philomena_web/templates/conversation/index.html.slime
index 422e621e..d64bf3e8 100644
--- a/lib/philomena_web/templates/conversation/index.html.slime
+++ b/lib/philomena_web/templates/conversation/index.html.slime
@@ -16,19 +16,20 @@ h1 My Conversations
           th.table--communication-list__options Options
       tbody
         = for c <- @conversations do
-          td.table--communication-list__name
-            => link c.title, to: Routes.conversation_path(@conn, :show, c)
+          tr
+            td.table--communication-list__name
+              => link c.title, to: Routes.conversation_path(@conn, :show, c)
 
-            .small-text.hide-mobile
-              ' Started
-              = pretty_time(c.created_at)
-              ' , last message
-              = pretty_time(c.last_message_at)
+              .small-text.hide-mobile
+                ' Started
+                = pretty_time(c.created_at)
+                ' , last message
+                = pretty_time(c.last_message_at)
 
-          td.table--communication-list__stats
-            = render PhilomenaWeb.UserAttributionView, "_user.html", object: %{user: other_party(@current_user.id, c)}, conn: @conn
-          td.table--communication-list__options
-            | Last message
+            td.table--communication-list__stats
+              = render PhilomenaWeb.UserAttributionView, "_user.html", object: %{user: other_party(@current_user.id, c)}, conn: @conn
+            td.table--communication-list__options
+              | Last message
 
   .block__header.block__header--light
     = pagination
\ No newline at end of file