diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.js b/src/renderer/components/watch-video-comments/watch-video-comments.js
index 424b18ad..61890fd2 100644
--- a/src/renderer/components/watch-video-comments/watch-video-comments.js
+++ b/src/renderer/components/watch-video-comments/watch-video-comments.js
@@ -151,6 +151,9 @@ export default Vue.extend({
             comment.likes = null
           }
           comment.text = autolinker.link(comment.text)
+          comment.replies.forEach((reply) => {
+            reply.text = autolinker.link(reply.text)
+          })
           return comment
         })
         this.commentData = this.commentData.concat(commentData)
diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.vue b/src/renderer/components/watch-video-comments/watch-video-comments.vue
index 9692f77a..abebf4a2 100644
--- a/src/renderer/components/watch-video-comments/watch-video-comments.vue
+++ b/src/renderer/components/watch-video-comments/watch-video-comments.vue
@@ -96,9 +96,11 @@
                 {{ reply.time }}
               </span>
             </p>
-            <p class="commentText">
-              {{ reply.text }}
-            </p>
+            <ft-timestamp-catcher
+              class="commentText"
+              :input-html="reply.text"
+              @timestamp-event="onTimestamp"
+            />
             <p class="commentLikeCount">
               <font-awesome-icon
                 icon="thumbs-up"