diff --git a/src/shared/components/common/moment-time.tsx b/src/shared/components/common/moment-time.tsx
index 20623932..122fbf7c 100644
--- a/src/shared/components/common/moment-time.tsx
+++ b/src/shared/components/common/moment-time.tsx
@@ -23,13 +23,27 @@ export class MomentTime extends Component<MomentTimeProps, any> {
     moment.locale(lang);
   }
 
+  createdAndModifiedTimes() {
+    let created = this.props.data.published || this.props.data.when_;
+    return `
+      <div>
+        <div>
+          ${capitalizeFirstLetter(i18n.t("created"))}: ${this.format(created)}
+        </div>
+        <div>
+          ${capitalizeFirstLetter(i18n.t("modified"))} ${this.format(
+      this.props.data.updated
+    )}
+        </div>
+        </div>`;
+  }
+
   render() {
     if (!this.props.ignoreUpdated && this.props.data.updated) {
       return (
         <span
-          data-tippy-content={`${capitalizeFirstLetter(
-            i18n.t("modified")
-          )} ${this.format(this.props.data.updated)}`}
+          data-tippy-content={this.createdAndModifiedTimes()}
+          data-tippy-allowHtml={true}
           className="font-italics pointer unselectable"
         >
           <Icon icon="edit-2" classes="icon-inline mr-1" />
@@ -37,13 +51,13 @@ export class MomentTime extends Component<MomentTimeProps, any> {
         </span>
       );
     } else {
-      let str = this.props.data.published || this.props.data.when_;
+      let created = this.props.data.published || this.props.data.when_;
       return (
         <span
           className="pointer unselectable"
-          data-tippy-content={this.format(str)}
+          data-tippy-content={this.format(created)}
         >
-          {moment.utc(str).fromNow(!this.props.showAgo)}
+          {moment.utc(created).fromNow(!this.props.showAgo)}
         </span>
       );
     }