diff --git a/public/css/index.css b/public/css/index.css
index 20b4836909..8cea4e2c1d 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -531,11 +531,11 @@ footer .ui.left,footer .ui.right{line-height:40px}
 .repository.view.issue .comment-list .comment .actions .item.tag{margin-right:5px}
 .repository.view.issue .comment-list .comment .actions .item.action{margin-top:6px;margin-left:10px}
 .repository.view.issue .comment-list .comment .content{margin-left:4em}
-.repository.view.issue .comment-list .comment .content>.header{font-weight:400;position:relative;padding:0 15px;color:#767676;background-color:#f7f7f7;border-bottom:1px solid #eee;border-top-left-radius:3px;border-top-right-radius:3px;justify-content:space-between}
+.repository.view.issue .comment-list .comment .content>.header{font-weight:400;padding:auto 15px;position:relative;color:#767676;background-color:#f7f7f7;border-bottom:1px solid #eee;border-top-left-radius:3px;border-top-right-radius:3px}
 .repository.view.issue .comment-list .comment .content>.header:after,.repository.view.issue .comment-list .comment .content>.header:before{right:100%;top:20px;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}
 .repository.view.issue .comment-list .comment .content>.header:before{border-right-color:#d3d3d4;border-width:9px;margin-top:-9px}
 .repository.view.issue .comment-list .comment .content>.header:after{border-right-color:#f7f7f7;border-width:8px;margin-top:-8px}
-.repository.view.issue .comment-list .comment .content>.header .text{padding-top:10px;padding-bottom:10px}
+.repository.view.issue .comment-list .comment .content>.header .text{max-width:78%;padding-top:10px;padding-bottom:10px}
 .repository.view.issue .comment-list .comment .content .markdown{font-size:14px}
 .repository.view.issue .comment-list .comment .content .no-content{color:#767676;font-style:italic}
 .repository.view.issue .comment-list .comment .content>.bottom.segment{background:#f3f4f5}
diff --git a/public/less/_repository.less b/public/less/_repository.less
index 3b02b1691b..9956bbce74 100644
--- a/public/less/_repository.less
+++ b/public/less/_repository.less
@@ -798,16 +798,16 @@
                     > .header {
                         #avatar-arrow;
                         font-weight: normal;
+                        padding: auto 15px;
                         position: relative;
-                        padding: 0 15px;
                         color: #767676;
                         background-color: #f7f7f7;
                         border-bottom: 1px solid #eeeeee;
                         border-top-left-radius: 3px;
                         border-top-right-radius: 3px;
-                        justify-content: space-between;
 
                         .text {
+                            max-width: 78%;
                             padding-top: 10px;
                             padding-bottom: 10px;
                         }
diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl
index 08fa1d6f52..1288886a61 100644
--- a/templates/repo/diff/comments.tmpl
+++ b/templates/repo/diff/comments.tmpl
@@ -8,7 +8,7 @@
 	<div class="content">
 		<div class="ui top attached header">
 			<span class="text grey"><a {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.GetDisplayName}}</a> {{$.root.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}}</span>
-			<div class="ui actions">
+			<div class="ui right actions">
 			{{if and .Review}}
 				{{if eq .Review.Type 0}}
 					<div class="item tag">