diff --git a/client/css/comment-control.styl b/client/css/comment-control.styl
index 343dbd46..96d7e7af 100644
--- a/client/css/comment-control.styl
+++ b/client/css/comment-control.styl
@@ -52,6 +52,9 @@ $comment-border-color = #DDD
                 padding: 0 1em
                 line-height: 2.25em
 
+            .score-container, .link-container
+                display: inline-block
+
             &:before
                 position: absolute
                 display: block
diff --git a/client/html/comment.tpl b/client/html/comment.tpl
index b3b961a0..04469c9a 100644
--- a/client/html/comment.tpl
+++ b/client/html/comment.tpl
@@ -41,20 +41,20 @@
 
                 %><span class='score-container'></span><%
 
-                %><wbr><%
+                %><% if (ctx.canEditComment || ctx.canDeleteComment) { %><%
+                    %><span class='action-container'><%
+                        %><% if (ctx.canEditComment) { %><%
+                            %><a href class='edit'><%
+                                %><i class='fa fa-pencil'></i>&nbsp;edit<%
+                            %></a><%
+                        %><% } %><%
 
-                %><% if (ctx.canEditComment) { %><%
-                    %><a href class='edit'><%
-                        %><i class='fa fa-pencil'></i> edit<%
-                    %></a><%
-                %><% } %><%
-
-                %><wbr><%
-
-                %><% if (ctx.canDeleteComment) { %><%
-                    %><a href class='delete'><%
-                        %><i class='fa fa-remove'></i> delete<%
-                    %></a><%
+                        %><% if (ctx.canDeleteComment) { %><%
+                            %><a href class='delete'><%
+                                %><i class='fa fa-remove'></i>&nbsp;delete<%
+                            %></a><%
+                        %><% } %><%
+                    %></span><%
                 %><% } %><%
             %></nav><%
         %></header>