diff --git a/src/main/twirl/gitbucket/core/issues/commentlist.scala.html b/src/main/twirl/gitbucket/core/issues/commentlist.scala.html
index 684efdf..00f1ac0 100644
--- a/src/main/twirl/gitbucket/core/issues/commentlist.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/commentlist.scala.html
@@ -236,9 +236,47 @@
     @gitbucket.core.helper.html.commitcomments(comments, isManageable, repository, pullreq.map(_.commitIdTo))
   }
   case comment: gitbucket.core.model.CommitComment => {
+    <div id="discussion_r@comment.commentId">
+      <div class="panel panel-default commit-comment-box commit-comment-@comment.commentId">
+        <div class="panel-heading">
+          @helpers.avatar(comment.commentedUserName, 20)
+          @helpers.user(comment.commentedUserName, styleClass="username strong")
+          <span class="muted">
+            commented on
+            @if(comment.issueId.isDefined){
+              <a href="@helpers.url(repository)/pull/@comment.issueId">#@comment.issueId</a>
+            }
+            @comment.fileName.map { fileName =>
+              @fileName in
+            }
+            <a href="@context.path/@repository.owner/@repository.name/commit/@comment.commitId">@comment.commitId.substring(0, 7)</a>
+            @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
+          </span>
+          <span class="pull-right">
+            @if(isManageable || context.loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false)){
+              <a href="#" data-comment-id="@comment.commentId"><i class="octicon octicon-pencil"></i></a>&nbsp;
+              <a href="#" data-comment-id="@comment.commentId"><i class="octicon octicon-x"></i></a>
+            }
+          </span>
+        </div>
+        <div class="panel-body issue-content commit-commentContent-@comment.commentId markdown-body">
+        @helpers.markdown(
+          markdown = comment.content,
+          repository = repository,
+          enableWikiLink = false,
+          enableRefsLink = true,
+          enableLineBreaks = true,
+          enableTaskList = false,
+          hasWritePermission = isManageable
+        )
+        </div>
+      </div>
+    </div>
+    @*
     @gitbucket.core.helper.html.commitcomments(gitbucket.core.model.CommitComments(
       comment.fileName.getOrElse(""), comment.commentedUserName, comment.registeredDate, Seq(comment)
     ), isManageable, repository, pullreq.map(_.commitIdTo))
+    *@
   }
 }
 <script>
diff --git a/src/main/twirl/gitbucket/core/repo/commit.scala.html b/src/main/twirl/gitbucket/core/repo/commit.scala.html
index 0658bbf..19f0782 100644
--- a/src/main/twirl/gitbucket/core/repo/commit.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/commit.scala.html
@@ -1,3 +1,4 @@
+@import gitbucket.core.model.CommitComment
 @(commitId: String,
   commit: gitbucket.core.util.JGitUtil.CommitInfo,
   branches: List[String],
@@ -87,7 +88,20 @@
       <input type="checkbox" id="show-notes"> Show line notes below
     </label>
     <div id="comment-list">
-      @gitbucket.core.issues.html.commentlist(None, comments, hasWritePermission, repository, None)
+      @gitbucket.core.issues.html.commentlist(
+        None,
+        comments.filter(_.asInstanceOf[gitbucket.core.model.CommitComment].fileName.isEmpty),
+        hasWritePermission,
+        repository,
+        None)
+      <div style="display: none;">
+        @gitbucket.core.issues.html.commentlist(
+          None,
+          comments.filter(_.asInstanceOf[gitbucket.core.model.CommitComment].fileName.isDefined),
+          hasWritePermission,
+          repository,
+          None)
+      </div>
     </div>
     @gitbucket.core.repo.html.commentform(commitId = commitId, hasWritePermission = hasWritePermission, repository = repository)
   }