diff --git a/lib/koenig-editor/addon/components/koenig-toolbar.js b/lib/koenig-editor/addon/components/koenig-toolbar.js
index a3ac2ef58..2ca8c8645 100644
--- a/lib/koenig-editor/addon/components/koenig-toolbar.js
+++ b/lib/koenig-editor/addon/components/koenig-toolbar.js
@@ -26,6 +26,7 @@ export default Component.extend({
     classNames: ['absolute', 'z-999'],
 
     // public attrs
+    editor: null,
     editorRange: null,
     activeMarkupTagNames: null,
     activeSectionTagNames: null,
@@ -120,7 +121,11 @@ export default Component.extend({
         },
 
         toggleSection(sectionName) {
+            let range = this.editorRange;
             this.toggleSection(sectionName);
+            this.editor.run((postEditor) => {
+                postEditor.setRange(range);
+            });
         },
 
         editLink() {