diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-button.hbs b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-button.hbs
index 6ef704bc78..eec47b831d 100644
--- a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-button.hbs
+++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-button.hbs
@@ -95,7 +95,9 @@
         {{!-- rendered (non-edit) mode view --}}
 
         <div class="{{if (eq @payload.alignment "center") "tc"}}">
-            <a class="gh-btn gh-btn-accent" href="javascript:void(0)" data-tooltip={{@payload.buttonUrl}}><span>{{@payload.buttonText}}</span></a>
+            <div class="dib" data-tooltip={{or @payload.buttonUrl "Add button URL"}}>
+                <a class="gh-btn gh-btn-accent {{if this.isIncomplete "o-50"}}" href="javascript:void(0)"><span>{{or @payload.buttonText "Add button text"}}</span></a>
+            </div>
         </div>
 
     {{/if}}
diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-button.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-button.js
index 5ba3107b9d..2a47a43f08 100644
--- a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-button.js
+++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-button.js
@@ -24,6 +24,12 @@ export default class KoenigCardButtonComponent extends Component {
         return isBlank(buttonText) && isBlank(buttonUrl);
     }
 
+    get isIncomplete() {
+        const {buttonText, buttonUrl} = this.args.payload;
+
+        return isBlank(buttonText) || isBlank(buttonUrl);
+    }
+
     get toolbar() {
         if (this.args.isEditing) {
             return false;