diff --git a/layout/_mixins/post-header.pug b/layout/_mixins/post-header.pug
index 56afe4886acc3ce26364d6c7bf87f7654eafe8d8..b02853a77e210cf0ffb10853dd14880e506f099f 100644
--- a/layout/_mixins/post-header.pug
+++ b/layout/_mixins/post-header.pug
@@ -5,12 +5,12 @@ mixin postHeader(post)
     if post.top
       include ../_partials/widgets/sticky-top.pug
 
-    if is_post()
-      h1.post-header-title= post.title || __("post.untitled")
-    else
-      h1.post-header-title
-        if post.link
-          a(href=url_for(post.link) target="_blank" rel="noopener" ).post-header-title__a= post.title || post.link
+    h1.post-header-title
+      if post.link
+        a(href=url_for(post.link) target="_blank" rel="noopener" ).post-header-title__a= post.title || post.link
+      else
+        if is_post()
+          = post.title || __("post.untitled")
         else
           a(href=url_for(post.path)).post-header-title__a= post.title || __("post.untitled")
 
diff --git a/layout/_partials/widgets/comments.pug b/layout/_partials/widgets/comments.pug
index a1ec57880f34381913b2b37a7326b8c1e1c6def1..b61d2f40678ee5b3a5c16fda1acd12435577ede9 100644
--- a/layout/_partials/widgets/comments.pug
+++ b/layout/_partials/widgets/comments.pug
@@ -3,6 +3,7 @@ if theme.disqus && theme.disqus.enable
     div#disqus_thread
 else if theme.valine && theme.valine.enable
   div#comments.comments
+    div#valine-container
 else if theme.gitalk && theme.gitalk.enable
   div#comments.comments
     div#gitalk-container
diff --git a/layout/_third-party/comments/valine.pug b/layout/_third-party/comments/valine.pug
index 42ed9be23f68712b0ed4fa9beeaefc7fcbf2e049..0f7e3366d4a0c8d916903304c8cf6544a52ab879 100644
--- a/layout/_third-party/comments/valine.pug
+++ b/layout/_third-party/comments/valine.pug
@@ -23,7 +23,7 @@ script&attributes(dataPjax).
     });
 
     new Valine({
-      el: '#comments',
+      el: '#valine-container',
       appId: '!{ theme.valine.appid }',
       appKey: '!{ theme.valine.appkey }',
       notify: !{ theme.valine.notify },