diff --git a/src/wp-includes/js/tinymce/plugins/wpview/plugin.js b/src/wp-includes/js/tinymce/plugins/wpview/plugin.js
index e706df4746..fe08e8b228 100644
--- a/src/wp-includes/js/tinymce/plugins/wpview/plugin.js
+++ b/src/wp-includes/js/tinymce/plugins/wpview/plugin.js
@@ -76,7 +76,7 @@ tinymce.PluginManager.add( 'wpview', function( editor ) {
 		editor.nodeChanged();
 	}
 
-	function handleEnter( view, before, keyCode ) {
+	function handleEnter( view, before, key ) {
 		var dom = editor.dom,
 			padNode = dom.create( 'p' );
 
@@ -92,7 +92,7 @@ tinymce.PluginManager.add( 'wpview', function( editor ) {
 
 		deselect();
 
-		if ( before && keyCode === VK.ENTER ) {
+		if ( before && key === VK.ENTER ) {
 			setViewCursor( before, view );
 		} else {
 			editor.selection.setCursorLocation( padNode, 0 );
@@ -336,207 +336,197 @@ tinymce.PluginManager.add( 'wpview', function( editor ) {
 
 	// (De)select views when arrow keys are used to navigate the content of the editor.
 	editor.on( 'keydown', function( event ) {
-		if ( event.metaKey || event.ctrlKey || ( keyCode >= 112 && keyCode <= 123 ) ) {
-			return;
-		}
-
-		if ( selected ) {
-			return;
-		}
-
-		var keyCode = event.keyCode,
+		var key = event.keyCode,
 			dom = editor.dom,
 			selection = editor.selection,
-			node = selection.getNode(),
-			view = getView( node ),
-			cursorBefore, cursorAfter,
-			range, clonedRange, tempRange;
+			node, view, cursorBefore, cursorAfter,
+			range, clonedRange, tempRange, remove;
 
-		lastKeyDownNode = node;
-
-		// Make sure we don't delete part of a view.
-		// If the range ends or starts with the view, we'll need to trim it.
-		if ( ! selection.isCollapsed() ) {
-			range = selection.getRng();
-
-			if ( view = getView( range.endContainer ) ) {
-				clonedRange = range.cloneRange();
-				selection.select( view.previousSibling, true );
-				selection.collapse();
-				tempRange = selection.getRng();
-				clonedRange.setEnd( tempRange.endContainer, tempRange.endOffset );
-				selection.setRng( clonedRange );
-			} else if ( view = getView( range.startContainer ) ) {
-				clonedRange = range.cloneRange();
-				clonedRange.setStart( view.nextSibling, 0 );
-				selection.setRng( clonedRange );
+		if ( selected ) {
+			// Let key presses that involve the command or control keys through.
+			// Also, let any of the F# keys through.
+			if ( event.metaKey || event.ctrlKey || ( key >= 112 && key <= 123 ) ) {
+				// But remove the view when cmd/ctrl + x/backspace are pressed.
+				if ( ( event.metaKey || event.ctrlKey ) && ( key === 88 || key === VK.BACKSPACE ) ) {
+					// We'll remove a cut view on keyup, otherwise the browser can't copy the content.
+					if ( key === 88 ) {
+						toRemove = selected;
+					} else {
+						editor.dom.remove( selected );
+					}
+				}
+				return;
 			}
-		}
 
-		if ( ! view ) {
-			return;
-		}
+			view = getView( selection.getNode() );
 
-		if ( ! ( ( cursorBefore = dom.hasClass( view, 'wpview-selection-before' ) ) ||
-				( cursorAfter = dom.hasClass( view, 'wpview-selection-after' ) ) ) ) {
-			return;
-		}
+			// If the caret is not within the selected view, deselect the view and bail.
+			if ( view !== selected ) {
+				deselect();
+				return;
+			}
 
-		if ( ( cursorAfter && keyCode === VK.UP ) || ( cursorBefore && keyCode === VK.BACKSPACE ) ) {
-			if ( view.previousSibling ) {
-				if ( getView( view.previousSibling ) ) {
-					setViewCursor( false, view.previousSibling );
+			if ( key === VK.LEFT ) {
+				setViewCursor( true, view );
+				event.preventDefault();
+			} else if ( key === VK.UP ) {
+				if ( view.previousSibling ) {
+					if ( getView( view.previousSibling ) ) {
+						setViewCursor( true, view.previousSibling );
+					} else {
+						deselect();
+						selection.select( view.previousSibling, true );
+						selection.collapse();
+					}
 				} else {
-					if ( dom.isEmpty( view.previousSibling ) && keyCode === VK.BACKSPACE ) {
-						dom.remove( view.previousSibling );
+					setViewCursor( true, view );
+				}
+				event.preventDefault();
+			} else if ( key === VK.RIGHT ) {
+				setViewCursor( false, view );
+				event.preventDefault();
+			} else if ( key === VK.DOWN ) {
+				if ( view.nextSibling ) {
+					if ( getView( view.nextSibling ) ) {
+						setViewCursor( false, view.nextSibling );
+					} else {
+						deselect();
+						selection.setCursorLocation( view.nextSibling, 0 );
+					}
+				} else {
+					setViewCursor( false, view );
+				}
+				event.preventDefault();
+			// Ignore keys that don't insert anything.
+			} else if ( ( key > 47 || VK.SPACEBAR || key === VK.ENTER || key === VK.DELETE || key === VK.BACKSPACE ) && key !== 144 && key !== 145 ) {
+				editor.undoManager.transact( function() {
+					remove = selected;
+					handleEnter( selected );
+					dom.remove( remove );
+				});
+
+				if ( key === VK.ENTER || key === VK.DELETE || key === VK.BACKSPACE ) {
+					event.preventDefault();
+				}
+			}
+		} else {
+			if ( event.metaKey || event.ctrlKey || ( key >= 112 && key <= 123 ) ) {
+				return;
+			}
+
+			node = selection.getNode();
+			lastKeyDownNode = node;
+			view = getView( node );
+
+			// Make sure we don't delete part of a view.
+			// If the range ends or starts with the view, we'll need to trim it.
+			if ( ! selection.isCollapsed() ) {
+				range = selection.getRng();
+
+				if ( view = getView( range.endContainer ) ) {
+					clonedRange = range.cloneRange();
+					selection.select( view.previousSibling, true );
+					selection.collapse();
+					tempRange = selection.getRng();
+					clonedRange.setEnd( tempRange.endContainer, tempRange.endOffset );
+					selection.setRng( clonedRange );
+				} else if ( view = getView( range.startContainer ) ) {
+					clonedRange = range.cloneRange();
+					clonedRange.setStart( view.nextSibling, 0 );
+					selection.setRng( clonedRange );
+				}
+			}
+
+			// Make sure we don't eat any content.
+			if ( event.keyCode === VK.BACKSPACE ) {
+				if ( editor.dom.isEmpty( node ) ) {
+					if ( view = getView( node.previousSibling ) ) {
+						setViewCursor( false, view );
+						editor.dom.remove( node );
+						event.preventDefault();
+						return;
+					}
+				} else if ( ( range = selection.getRng() ) &&
+						range.startOffset === 0 &&
+						range.endOffset === 0 &&
+						( view = getView( node.previousSibling ) ) ) {
+					setViewCursor( false, view );
+					event.preventDefault();
+					return;
+				}
+			}
+
+			if ( ! view ) {
+				return;
+			}
+
+			if ( ! ( ( cursorBefore = dom.hasClass( view, 'wpview-selection-before' ) ) ||
+					( cursorAfter = dom.hasClass( view, 'wpview-selection-after' ) ) ) ) {
+				return;
+			}
+
+			if ( ( cursorAfter && key === VK.UP ) || ( cursorBefore && key === VK.BACKSPACE ) ) {
+				if ( view.previousSibling ) {
+					if ( getView( view.previousSibling ) ) {
+						setViewCursor( false, view.previousSibling );
+					} else {
+						if ( dom.isEmpty( view.previousSibling ) && key === VK.BACKSPACE ) {
+							dom.remove( view.previousSibling );
+						} else {
+							selection.select( view.previousSibling, true );
+							selection.collapse();
+						}
+					}
+				} else {
+					setViewCursor( true, view );
+				}
+				event.preventDefault();
+			} else if ( cursorAfter && ( key === VK.DOWN || key === VK.RIGHT ) ) {
+				if ( view.nextSibling ) {
+					if ( getView( view.nextSibling ) ) {
+						setViewCursor( key === VK.RIGHT, view.nextSibling );
+					} else {
+						selection.setCursorLocation( view.nextSibling, 0 );
+					}
+				}
+				event.preventDefault();
+			} else if ( cursorBefore && ( key === VK.UP || key ===  VK.LEFT ) ) {
+				if ( view.previousSibling ) {
+					if ( getView( view.previousSibling ) ) {
+						setViewCursor( key === VK.UP, view.previousSibling );
 					} else {
 						selection.select( view.previousSibling, true );
 						selection.collapse();
 					}
 				}
-			} else {
-				setViewCursor( true, view );
-			}
-			event.preventDefault();
-		} else if ( cursorAfter && ( keyCode === VK.DOWN || keyCode === VK.RIGHT ) ) {
-			if ( view.nextSibling ) {
-				if ( getView( view.nextSibling ) ) {
-					setViewCursor( keyCode === VK.RIGHT, view.nextSibling );
+				event.preventDefault();
+			} else if ( cursorBefore && key === VK.DOWN ) {
+				if ( view.nextSibling ) {
+					if ( getView( view.nextSibling ) ) {
+						setViewCursor( true, view.nextSibling );
+					} else {
+						selection.setCursorLocation( view.nextSibling, 0 );
+					}
 				} else {
-					selection.setCursorLocation( view.nextSibling, 0 );
-				}
-			}
-			event.preventDefault();
-		} else if ( cursorBefore && ( keyCode === VK.UP || keyCode ===  VK.LEFT ) ) {
-			if ( view.previousSibling ) {
-				if ( getView( view.previousSibling ) ) {
-					setViewCursor( keyCode === VK.UP, view.previousSibling );
-				} else {
-					selection.select( view.previousSibling, true );
-					selection.collapse();
-				}
-			}
-			event.preventDefault();
-		} else if ( cursorBefore && keyCode === VK.DOWN ) {
-			if ( view.nextSibling ) {
-				if ( getView( view.nextSibling ) ) {
-					setViewCursor( true, view.nextSibling );
-				} else {
-					selection.setCursorLocation( view.nextSibling, 0 );
-				}
-			} else {
-				setViewCursor( false, view );
-			}
-			event.preventDefault();
-		} else if ( ( cursorAfter && keyCode === VK.LEFT ) || ( cursorBefore && keyCode === VK.RIGHT ) ) {
-			select( view );
-			event.preventDefault();
-			event.stopImmediatePropagation();
-		} else if ( cursorAfter && keyCode === VK.BACKSPACE ) {
-			dom.remove( view );
-			event.preventDefault();
-		} else if ( cursorAfter ) {
-			handleEnter( view );
-		} else if ( cursorBefore ) {
-			handleEnter( view , true, keyCode );
-		}
-
-		if ( keyCode === VK.ENTER ) {
-			event.preventDefault();
-		}
-	});
-
-	// Handle key presses for selected views.
-	editor.on( 'keydown', function( event ) {
-		var dom = editor.dom,
-			keyCode = event.keyCode,
-			selection = editor.selection,
-			view;
-
-		// If a view isn't selected, let the event go on its merry way.
-		if ( ! selected ) {
-			return;
-		}
-
-		// Let key presses that involve the command or control keys through.
-		// Also, let any of the F# keys through.
-		if ( event.metaKey || event.ctrlKey || ( keyCode >= 112 && keyCode <= 123 ) ) {
-			// But remove the view when cmd/ctrl + x/backspace are pressed.
-			if ( ( event.metaKey || event.ctrlKey ) && ( keyCode === 88 || keyCode === VK.BACKSPACE ) ) {
-				// We'll remove a cut view on keyup, otherwise the browser can't copy the content.
-				if ( keyCode === 88 ) {
-					toRemove = selected;
-				} else {
-					editor.dom.remove( selected );
-				}
-			}
-			return;
-		}
-
-		view = getView( selection.getNode() );
-
-		// If the caret is not within the selected view, deselect the view and bail.
-		if ( view !== selected ) {
-			deselect();
-			return;
-		}
-
-		if ( keyCode === VK.LEFT ) {
-			setViewCursor( true, view );
-		} else if ( keyCode === VK.UP ) {
-			if ( view.previousSibling ) {
-				if ( getView( view.previousSibling ) ) {
-					setViewCursor( true, view.previousSibling );
-				} else {
-					deselect();
-					selection.select( view.previousSibling, true );
-					selection.collapse();
-				}
-			} else {
-				setViewCursor( true, view );
-			}
-
-		} else if ( keyCode === VK.RIGHT ) {
-			setViewCursor( false, view );
-		} else if ( keyCode === VK.DOWN ) {
-			if ( view.nextSibling ) {
-				if ( getView( view.nextSibling ) ) {
-					setViewCursor( false, view.nextSibling );
-				} else {
-					deselect();
-					selection.setCursorLocation( view.nextSibling, 0 );
-				}
-			} else {
-				setViewCursor( false, view );
-			}
-		} else if ( keyCode === VK.ENTER ) {
-			handleEnter( view );
-		} else if ( keyCode === VK.DELETE || keyCode === VK.BACKSPACE ) {
-			dom.remove( selected );
-		}
-
-		event.preventDefault();
-	});
-
-	// Make sure we don't eat any content.
-	editor.on( 'keydown', function( event ) {
-		var selection = editor.selection,
-			node, range, view;
-
-		if ( event.keyCode === VK.BACKSPACE ) {
-			node = selection.getNode();
-
-			if ( editor.dom.isEmpty( node ) ) {
-				if ( view = getView( node.previousSibling ) ) {
 					setViewCursor( false, view );
-					editor.dom.remove( node );
-					event.preventDefault();
 				}
-			} else if ( ( range = selection.getRng() ) &&
-					range.startOffset === 0 &&
-					range.endOffset === 0 &&
-					( view = getView( node.previousSibling ) ) ) {
-				setViewCursor( false, view );
+				event.preventDefault();
+			} else if ( ( cursorAfter && key === VK.LEFT ) || ( cursorBefore && key === VK.RIGHT ) ) {
+				select( view );
+				event.preventDefault();
+			} else if ( cursorAfter && key === VK.BACKSPACE ) {
+				editor.undoManager.transact( function() {
+					handleEnter( view );
+					dom.remove( view );
+				});
+				event.preventDefault();
+			} else if ( cursorAfter ) {
+				handleEnter( view );
+			} else if ( cursorBefore ) {
+				handleEnter( view , true, key );
+			}
+
+			if ( key === VK.ENTER ) {
 				event.preventDefault();
 			}
 		}
@@ -580,9 +570,12 @@ tinymce.PluginManager.add( 'wpview', function( editor ) {
 
 		clearInterval( cursorInterval );
 
-		dom.removeClass( views, 'wpview-selection-before' );
-		dom.removeClass( views, 'wpview-selection-after' );
-		dom.removeClass( views, 'wpview-cursor-hide' );
+		// This runs a lot and is faster than replacing each class separately
+		tinymce.each( views, function ( view ) {
+			if ( view.className ) {
+				view.className = view.className.replace( / ?\bwpview-(?:selection-before|selection-after|cursor-hide)\b/g, '' );
+			}
+		});
 
 		if ( focus ) {
 			if ( view ) {