From a6b45ad634192c08237e33b954d0a7bc4b71d200 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Fri, 12 Jan 2018 12:01:43 +1100
Subject: [PATCH] Trigger typing mode when BACKSPACE is pressed

---
 blocks/editable/index.js              | 1 -
 editor/components/block-list/block.js | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/blocks/editable/index.js b/blocks/editable/index.js
index 654dadd36df8f5..a225c4162b2db7 100644
--- a/blocks/editable/index.js
+++ b/blocks/editable/index.js
@@ -548,7 +548,6 @@ export default class Editable extends Component {
 			}
 
 			event.preventDefault();
-			event.stopImmediatePropagation();
 		}
 
 		// If we click shift+Enter on inline Editables, we avoid creating two contenteditables
diff --git a/editor/components/block-list/block.js b/editor/components/block-list/block.js
index c122259c48c388..f8d6dca5d8c206 100644
--- a/editor/components/block-list/block.js
+++ b/editor/components/block-list/block.js
@@ -263,6 +263,10 @@ export class BlockListBlock extends Component {
 		} else {
 			onMerge( previousBlock, block );
 		}
+
+		// Manually trigger typing mode, since merging will remove this block and
+		// cause onKeyDown to not fire
+		this.maybeStartTyping();
 	}
 
 	insertBlocksAfter( blocks ) {
@@ -335,6 +339,9 @@ export class BlockListBlock extends Component {
 						}
 					}
 				}
+
+				// Pressing backspace should trigger typing mode
+				this.maybeStartTyping();
 				break;
 
 			case ESCAPE: