diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-editor.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-editor.js
index ce2d0c67bb..321e79de24 100644
--- a/ghost/admin/lib/koenig-editor/addon/components/koenig-editor.js
+++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-editor.js
@@ -902,7 +902,7 @@ export default Component.extend({
         if (cardElem) {
             let cardId = cardElem.firstChild.id;
             let card = this.componentCards.findBy('destinationElementId', cardId);
-            if (card.isEditing || card.handlesDragDrop) {
+            if (card.isEditing || card.component.handlesDragDrop) {
                 return;
             }
         }
diff --git a/ghost/admin/lib/koenig-editor/addon/options/cards.js b/ghost/admin/lib/koenig-editor/addon/options/cards.js
index 3f64fc58d4..6a89b147b2 100644
--- a/ghost/admin/lib/koenig-editor/addon/options/cards.js
+++ b/ghost/admin/lib/koenig-editor/addon/options/cards.js
@@ -1,5 +1,7 @@
 import createComponentCard from '../utils/create-component-card';
 
+// TODO: move koenigOptions directly into cards now that card components register
+// themselves so that they are available on card.component
 export default [
     createComponentCard('card-markdown'), // backwards-compat with markdown editor
     createComponentCard('code', {deleteIfEmpty: 'payload.code'}),