diff --git a/lib/koenig-editor/addon/components/koenig-toolbar.js b/lib/koenig-editor/addon/components/koenig-toolbar.js
index dbb80b8438..57335ea053 100644
--- a/lib/koenig-editor/addon/components/koenig-toolbar.js
+++ b/lib/koenig-editor/addon/components/koenig-toolbar.js
@@ -98,6 +98,10 @@ export default Component.extend({
 
     actions: {
         toggleMarkup(markupName) {
+            if (markupName === 'em' && this.get('activeMarkupTagNames.isI')) {
+                markupName = 'i';
+            }
+
             this.toggleMarkup(markupName);
         },
 
diff --git a/lib/koenig-editor/addon/templates/components/koenig-toolbar.hbs b/lib/koenig-editor/addon/templates/components/koenig-toolbar.hbs
index 67e100075e..7e1500d702 100644
--- a/lib/koenig-editor/addon/templates/components/koenig-toolbar.hbs
+++ b/lib/koenig-editor/addon/templates/components/koenig-toolbar.hbs
@@ -10,8 +10,8 @@
 <button
     type="button"
     title="Italic"
-    class="koenig-toolbar-btn koenig-toolbar-btn-italic {{if activeMarkupTagNames.isI "selected"}}"
-    {{action "toggleMarkup" "i"}}
+    class="koenig-toolbar-btn koenig-toolbar-btn-italic {{if (or activeMarkupTagNames.isEm activeMarkupTagNames.isI) "selected"}}"
+    {{action "toggleMarkup" "em"}}
 >
     I
 </button>