diff --git a/src/core/client/stream/components/Comment/Comment.tsx b/src/core/client/stream/components/Comment/Comment.tsx
index 9216e8b14..d77b6c4ad 100644
--- a/src/core/client/stream/components/Comment/Comment.tsx
+++ b/src/core/client/stream/components/Comment/Comment.tsx
@@ -28,11 +28,7 @@ const Comment: StatelessComponent<CommentProps> = props => {
       <div>
         <Popover body={<PermalinkPopover commentId={props.id} />}>
           {({ toggleShow, ref }) => (
-            <Button
-              onClick={toggleShow}
-              style={{ color: "red" }}
-              innerRef={ref}
-            >
+            <Button onClick={toggleShow} innerRef={ref} primary>
               <Localized id="comments-permalink-share">
                 <span>Share</span>
               </Localized>
diff --git a/src/core/client/stream/components/PermalinkPopover.css b/src/core/client/stream/components/PermalinkPopover.css
index ee4ef4d5c..2d5f33fd2 100644
--- a/src/core/client/stream/components/PermalinkPopover.css
+++ b/src/core/client/stream/components/PermalinkPopover.css
@@ -3,5 +3,11 @@
 }
 
 .root {
-  background-color: #fff;
+  background-color: #ffffff;
+  border: 1px solid #c9cacb;
+  box-sizing: border-box;
+  box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.25);
+  border-radius: 1px;
+  padding: 6px 10px;
+  display: flex;
 }
diff --git a/src/core/client/ui/components/Popover/Popover.tsx b/src/core/client/ui/components/Popover/Popover.tsx
index e9f054de3..7f02fac3c 100644
--- a/src/core/client/ui/components/Popover/Popover.tsx
+++ b/src/core/client/ui/components/Popover/Popover.tsx
@@ -30,10 +30,9 @@ class Popover extends React.Component<InnerProps> {
 
   public render() {
     const { body, children } = this.props;
-    // const { show } = this.state;
-    // console.log(children);
+    const { show } = this.state;
     return (
-      <Attachment body={body} className={styles.root}>
+      <Attachment body={show ? body : null} className={styles.root}>
         {({ ref }) => children({ toggleShow: this.toggleShow, ref })}
       </Attachment>
     );