diff --git a/lib/Comment/CommentText.tsx b/lib/Comment/CommentText.tsx
index 17d286286..a89c26db4 100644
--- a/lib/Comment/CommentText.tsx
+++ b/lib/Comment/CommentText.tsx
@@ -47,7 +47,10 @@ function CommentText({
           return (
             <span key={subStr} title={name} className={mentionsClass}>
               {pending ? (
-                <TooltipWrapper tooltipText="Invite pending">
+                <TooltipWrapper
+                  tooltipText="Invite pending"
+                  wrapperClassName="inline-flex"
+                >
                   {subStr}
                 </TooltipWrapper>
               ) : (
diff --git a/lib/Conversation/stories/mockData.ts b/lib/Conversation/stories/mockData.ts
index 0dde47923..50227b4f4 100644
--- a/lib/Conversation/stories/mockData.ts
+++ b/lib/Conversation/stories/mockData.ts
@@ -68,6 +68,13 @@ export const mockComments = [
     author: mockUser,
     createdBy: 2,
   },
+  {
+    id: "comment-pending-user",
+    body: "Hey @lyndacarter, @lyndacarter, @lyndacarter, @lyndacarter, @lyndacarter @AlanT, @lyndacarter, @lyndacarter, @lyndacarter, @lyndacarter, @lyndacarter, @AlanT, @AlanT, @AlanT, @lyndacarter, @lyndacarter",
+    createdAt: "2017-06-08 10:56:41",
+    author: mockUser,
+    createdBy: 2,
+  },
   {
     id: "comment-id-2",
     body: "Comment body and a link to http://google.com and a mention @lyndacarter, another link to @saulgoodman",