diff --git a/src/wp-admin/js/wp-fullscreen.js b/src/wp-admin/js/wp-fullscreen.js
index 6ce373e391..a00940cd66 100644
--- a/src/wp-admin/js/wp-fullscreen.js
+++ b/src/wp-admin/js/wp-fullscreen.js
@@ -510,10 +510,10 @@
 				}
 			});
 
-			$document.on( 'keydown.wp-fullscreen', function( event ) {
-				if ( 27 === event.which && s.visible ) { // Esc
+			$( window ).on( 'keyup', function( event ) {
+				// Turn fullscreen off when Esc is pressed.
+				if ( 27 === event.keyCode && s.visible ) {
 					api.off();
-					event.stopImmediatePropagation();
 				}
 			});
 
diff --git a/src/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js b/src/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js
index ed60d3cd52..52f981198a 100644
--- a/src/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js
+++ b/src/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js
@@ -78,6 +78,13 @@ tinymce.PluginManager.add( 'wpfullscreen', function( editor ) {
 
 	editor.addCommand( 'wpFullScreen', toggleFullscreen );
 
+	editor.on( 'keyup', function( event ) {
+		// Turn fullscreen off when Esc is pressed.
+		if ( event.keyCode === 27 && wp.editor.fullscreen.settings.visible ) {
+			wp.editor.fullscreen.off();
+		}
+	} );
+
 	editor.on( 'init', function() {
 		// Set the editor when initializing from whitin DFW
 		if ( editor.getParam('wp_fullscreen') ) {