diff --git a/app/assets/stylesheets/request-for-comments.css.scss b/app/assets/stylesheets/request-for-comments.css.scss
index 87eeba44..6f28a6f0 100644
--- a/app/assets/stylesheets/request-for-comments.css.scss
+++ b/app/assets/stylesheets/request-for-comments.css.scss
@@ -21,3 +21,11 @@
 .ace_tooltip {
   display: none !important;
 }
+
+.popover-username {
+  font-weight: bold;
+}
+
+.popover-comment {
+  word-wrap: break-word;
+}
diff --git a/app/views/request_for_comments/show.html.erb b/app/views/request_for_comments/show.html.erb
index 96470d05..7efa26a3 100644
--- a/app/views/request_for_comments/show.html.erb
+++ b/app/views/request_for_comments/show.html.erb
@@ -178,7 +178,8 @@ also, all settings from the rails model needed for the editor configuration in t
         }
         var popupContent = '';
         cluster.forEach(function(comment) {
-          popupContent += '<p><b>' + comment.username + '</b>: ' + preprocess(comment.text) + '<p>';
+            popupContent += '<p><div class="popover-username">' + comment.username + ':</div>' +
+                '<div class="popover-comment">' + preprocess(comment.text) + '</div><p>';
         });
         var icon = $('*[data-file-id="' + fileid + '"] > .ace_gutter > .ace_gutter-layer > div:nth-child(' + (clusterRow + 1) + ')');
         icon.popover({