diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-html.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-html.js
index f0789a47d4..3d7b2fa87c 100644
--- a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-html.js
+++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-html.js
@@ -23,13 +23,21 @@ export default Component.extend({
 
     actions: {
         updateHtml(html) {
-            let payload = this.get('payload');
-            let save = this.get('saveCard');
+            this._updatePayloadAttr('html', html);
+        },
 
-            set(payload, 'html', html);
-
-            // update the mobiledoc and stay in edit mode
-            save(payload, false);
+        updateCaption(caption) {
+            this._updatePayloadAttr('caption', caption);
         }
+    },
+
+    _updatePayloadAttr(attr, value) {
+        let payload = this.get('payload');
+        let save = this.get('saveCard');
+
+        set(payload, attr, value);
+
+        // update the mobiledoc and stay in edit mode
+        save(payload, false);
     }
 });
diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-html.hbs b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-html.hbs
index 2bb669bef7..9566e776ed 100644
--- a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-html.hbs
+++ b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-html.hbs
@@ -11,8 +11,20 @@
             autofocus=true
             update=(action "updateHtml")
         }}
+
+        <input
+            value={{payload.caption}}
+            type="text"
+            class="miw-100 tc bn form-text"
+            oninput={{action "updateCaption" value="target.value"}}
+            placeholder="Type caption for embed (optional)">
     {{else}}
         {{{payload.html}}}
+
+        {{#if payload.caption}}
+            <p class={{kg-style "figcaption"}}>{{{payload.caption}}}</p>
+        {{/if}}
+
         <div class="koenig-card-click-overlay"></div>
     {{/if}}
 {{/koenig-card}}