diff --git a/client/src/app/tabs/json/CodeMirror.js b/client/src/app/tabs/json/CodeMirror.js
index 4d7fa7204c..a65550a138 100644
--- a/client/src/app/tabs/json/CodeMirror.js
+++ b/client/src/app/tabs/json/CodeMirror.js
@@ -56,7 +56,8 @@ export default function create() {
         tabSize,
         searchExtension,
         EditorView.contentAttributes.of({
-          'aria-label': 'JSON editor'
+          'aria-label': 'JSON editor',
+          'tabindex': 0
         }),
         ...extensions
       ]
diff --git a/client/src/app/tabs/xml/CodeMirror.js b/client/src/app/tabs/xml/CodeMirror.js
index 19b0e9f33b..04fa4a9fd8 100644
--- a/client/src/app/tabs/xml/CodeMirror.js
+++ b/client/src/app/tabs/xml/CodeMirror.js
@@ -56,7 +56,8 @@ export default function create() {
         tabSize,
         searchExtension,
         EditorView.contentAttributes.of({
-          'aria-label': 'XML editor'
+          'aria-label': 'XML editor',
+          'tabindex': 0
         }),
         ...extensions
       ]