diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image.js
index 33c733afe1..3a373d696c 100644
--- a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image.js
+++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image.js
@@ -267,10 +267,6 @@ export default Component.extend({
             }
 
             set(this.payload, 'imageSelector', undefined);
-
-            // ensure focus is returned to the editor so that the card which
-            // appears selected behaves as if it's selected
-            this.editor.focus();
         },
 
         updateHref(href) {
diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image/selector-tenor.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image/selector-tenor.js
index 9049a26f74..d800a7bd54 100644
--- a/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image/selector-tenor.js
+++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-card-image/selector-tenor.js
@@ -60,7 +60,6 @@ export default class KoenigCardImageTenorSelector extends Component {
             type: 'gif'
         };
 
-        this.args.selector.insertCard('image', payload);
-        this.args.selector.close();
+        this.args.select(payload);
     }
 }