diff --git a/src/jsoneditor/components/TextMode.js b/src/jsoneditor/components/TextMode.js
index 0e6b37f..84c3c64 100644
--- a/src/jsoneditor/components/TextMode.js
+++ b/src/jsoneditor/components/TextMode.js
@@ -117,6 +117,8 @@ export default class TextMode extends Component {
   /** @protected */
   renderMenu () {
     return h(TextModeMenu, {
+      key: 'menu',
+
       mode: this.props.mode,
       modes: this.props.modes,
       onChangeMode: this.props.onChangeMode,
diff --git a/src/jsoneditor/components/menu/ModeSelector.js b/src/jsoneditor/components/menu/ModeSelector.js
index 149a35f..cc10340 100644
--- a/src/jsoneditor/components/menu/ModeSelector.js
+++ b/src/jsoneditor/components/menu/ModeSelector.js
@@ -18,13 +18,17 @@ export default class ModeSelector extends Component {
           className: 'jsoneditor-menu-button jsoneditor-type-modes' +
               ((mode === this.props.mode) ? ' jsoneditor-selected' : ''),
           onClick: () => {
-            try {
-              this.props.onRequestClose()
-              this.props.onChangeMode(mode)
-            }
+            this.props.onRequestClose()
+
+            // send the onChangeMode on the next tick, after onRequestClose is executed and applied
+            setTimeout(() => {
+              try {
+                this.props.onChangeMode(mode)
+              }
             catch (err) {
-              this.props.onError(err)
-            }
+                this.props.onError(err)
+              }
+            })
           }
         }, toCapital(mode))
       })
diff --git a/src/jsoneditor/components/menu/TextModeMenu.js b/src/jsoneditor/components/menu/TextModeMenu.js
index 88fcbe6..48fb6fa 100644
--- a/src/jsoneditor/components/menu/TextModeMenu.js
+++ b/src/jsoneditor/components/menu/TextModeMenu.js
@@ -29,7 +29,7 @@ export default class TreeModeMenu extends PureComponent {
     // mode
     if (this.props.modes ) {
       items = items.concat([
-        h('div', {className: 'jsoneditor-menu-group'}, [
+        h('div', {className: 'jsoneditor-menu-group', key: 'mode'}, [
           h(ModeButton, {
             key: 'mode',
             modes: this.props.modes,
@@ -43,24 +43,26 @@ export default class TreeModeMenu extends PureComponent {
 
     // format / compact / repair
     items = items.concat([
-      h('button', {
-        key: 'format',
-        className: 'jsoneditor-format',
-        title: 'Format the JSON document',
-        onClick: this.props.onFormat
-      }, h('i', {className: 'fa fa-align-left'})),
-      h('button', {
-        key: 'compact',
-        className: 'jsoneditor-compact',
-        title: 'Compact the JSON document',
-        onClick: this.props.onCompact
-      }, h('i', {className: 'fa fa-align-justify'})),
-      h('button', {
-        key: 'repair',
-        className: 'jsoneditor-repair',
-        title: 'Repair the JSON document',
-        onClick: this.props.onRepair
-      }, h('i', {className: 'fa fa-screwdriver'})),
+      h('div', {className: 'jsoneditor-menu-group', key: 'format-compact-repair'}, [
+        h('button', {
+          key: 'format',
+          className: 'jsoneditor-format',
+          title: 'Format the JSON document',
+          onClick: this.props.onFormat
+        }, h('i', {className: 'fa fa-align-left'})),
+        h('button', {
+          key: 'compact',
+          className: 'jsoneditor-compact',
+          title: 'Compact the JSON document',
+          onClick: this.props.onCompact
+        }, h('i', {className: 'fa fa-align-justify'})),
+        h('button', {
+          key: 'repair',
+          className: 'jsoneditor-repair',
+          title: 'Repair the JSON document',
+          onClick: this.props.onRepair
+        }, h('i', {className: 'fa fa-screwdriver'})),
+      ])
     ])
 
     return h('div', {key: 'menu', className: 'jsoneditor-menu'}, items)