diff --git a/src/main/ts/components/Editor.tsx b/src/main/ts/components/Editor.tsx
index ac57fa0b..407b89ee 100644
--- a/src/main/ts/components/Editor.tsx
+++ b/src/main/ts/components/Editor.tsx
@@ -19,6 +19,7 @@ export interface IProps {
   value: string;
   init: EditorOptions & Partial<Record<'selector' | 'target' | 'readonly' | 'license_key', undefined>>;
   tagName: string;
+  tabIndex: number;
   cloudChannel: Version;
   plugins: NonNullable<EditorOptions['plugins']>;
   toolbar: NonNullable<EditorOptions['toolbar']>;
@@ -180,7 +181,8 @@ export class Editor extends React.Component<IAllProps> {
 
     return React.createElement(tagName, {
       ref: this.elementRef,
-      id: this.id
+      id: this.id,
+      tabIndex: this.props.tabIndex
     });
   }
 
@@ -189,7 +191,8 @@ export class Editor extends React.Component<IAllProps> {
       ref: this.elementRef,
       style: { visibility: 'hidden' },
       name: this.props.textareaName,
-      id: this.id
+      id: this.id,
+      tabIndex: this.props.tabIndex
     });
   }
 
diff --git a/src/main/ts/components/EditorPropTypes.ts b/src/main/ts/components/EditorPropTypes.ts
index c3475568..771f1ae3 100644
--- a/src/main/ts/components/EditorPropTypes.ts
+++ b/src/main/ts/components/EditorPropTypes.ts
@@ -96,6 +96,7 @@ export const EditorPropTypes: IEditorPropTypes = {
   onEditorChange: PropTypes.func,
   value: PropTypes.string,
   tagName: PropTypes.string,
+  tabIndex: PropTypes.number,
   cloudChannel: PropTypes.string,
   plugins: PropTypes.oneOfType([ PropTypes.string, PropTypes.array ]),
   toolbar: PropTypes.oneOfType([ PropTypes.string, PropTypes.array ]),