diff --git a/README.md b/README.md
index f3be7832..9fcc9dae 100644
--- a/README.md
+++ b/README.md
@@ -584,6 +584,9 @@ import ReactQuill, { Quill, Mixin, Toolbar } from 'react-quill'; // ES6
 `theme`
 : The name of the theme to apply to the editor. Defaults to `snow`, Quill's standard theme. Pass `null` to use the minimal core theme. See the [docs on themes](#theme) for more information on including the required stylesheets.
 
+`tabIndex`
+: The order in which the editor becomes focused, among other controls in the page, during keyboard navigation.
+
 `bounds`
 : Selector or DOM element used by Quill to constrain position of popups. Defaults to `document.body`.
 
diff --git a/src/component.js b/src/component.js
index 239b5d22..3d6fd618 100644
--- a/src/component.js
+++ b/src/component.js
@@ -23,6 +23,7 @@ var QuillComponent = React.createClass({
 		value: T.oneOfType([T.string, T.shape({ops: T.array})]),
 		defaultValue: T.oneOfType([T.string, T.shape({ops: T.array})]),
 		placeholder: T.string,
+		tabIndex: T.number,
 		bounds: T.oneOfType([T.string, T.element]),
 		onKeyPress: T.func,
 		onKeyDown: T.func,
@@ -112,6 +113,7 @@ var QuillComponent = React.createClass({
 		'className',
 		'style',
 		'placeholder',
+		'tabIndex',
 		'onKeyPress',
 		'onKeyDown',
 		'onKeyUp',
@@ -324,6 +326,7 @@ var QuillComponent = React.createClass({
 
 		var properties = {
 			key: this.state.generation,
+			tabIndex: this.props.tabIndex,
 			ref: function(element) { self.editingArea = element },
 		};