diff --git a/playground/index.jsx b/playground/index.jsx
index b7750278..a792aba0 100644
--- a/playground/index.jsx
+++ b/playground/index.jsx
@@ -41,6 +41,10 @@ class Demo extends React.Component {
     console.log(this.state.editorState.toHTML())
   }
 
+  logRAW = () => {
+    console.log(this.state.editorState.toRAW())
+  }
+
   render() {
 
     const { readOnly, editorState } = this.state
@@ -50,6 +54,12 @@ class Demo extends React.Component {
         <div className="demo" id="demo">
           <BraftEditor
             extendControls={[{
+              key: 'log-raw',
+              type: 'button',
+              text: 'Log RAW',
+              // disabled: true,
+              onClick: this.logRAW,
+            }, {
               key: 'log-html',
               type: 'button',
               text: 'Log HTML',
diff --git a/src/configs/handlers.js b/src/configs/handlers.js
index 9a12491d..43239e92 100644
--- a/src/configs/handlers.js
+++ b/src/configs/handlers.js
@@ -35,12 +35,21 @@ export const keyCommandHandlers = (command, editorState, editor) => {
   }
 
   if (command === 'tab') {
-
     const blockType = ContentUtils.getSelectionBlockType(editorState)
 
     if (blockType === 'code-block') {
       editor.setValue(ContentUtils.insertText(editorState, ' '.repeat(editor.editorProps.codeTabIndents)))
       return 'handled'
+    } else if (blockType === 'ordered-list-item' || blockType === 'unordered-list-item') {
+      const newEditorState = RichUtils.onTab(
+        event,
+        editorState,
+        4,
+      )
+      if (newEditorState !== editorState) {
+        editor.setValue(newEditorState)
+      }
+      return 'handled'
     } else if (blockType !== 'atomic' && allowIndent && cursorIsAtFirst) {
       editor.setValue(ContentUtils.increaseSelectionIndent(editorState))
       return 'handled'