diff --git a/src/wp-admin/js/code-editor.js b/src/wp-admin/js/code-editor.js
index 1dcac07e70..5c826726fc 100644
--- a/src/wp-admin/js/code-editor.js
+++ b/src/wp-admin/js/code-editor.js
@@ -136,13 +136,19 @@ if ( 'undefined' === typeof window.wp.codeEditor ) {
 
 		// Keep lint options populated.
 		editor.on( 'optionChange', function( cm, option ) {
-			var options;
+			var options, gutters, gutterName = 'CodeMirror-lint-markers';
 			if ( 'lint' !== option ) {
 				return;
 			}
+			gutters = editor.getOption( 'gutters' ) || [];
 			options = editor.getOption( 'lint' );
 			if ( true === options ) {
+				if ( ! _.contains( gutters, gutterName ) ) {
+					editor.setOption( 'gutters', [ gutterName ].concat( gutters ) );
+				}
 				editor.setOption( 'lint', getLintOptions() ); // Expand to include linting options.
+			} else if ( ! options ) {
+				editor.setOption( 'gutters', _.without( gutters, gutterName ) );
 			}
 
 			// Force update on error notice to show or hide.
diff --git a/src/wp-includes/general-template.php b/src/wp-includes/general-template.php
index e4001f9c4d..915aea540e 100644
--- a/src/wp-includes/general-template.php
+++ b/src/wp-includes/general-template.php
@@ -3157,6 +3157,7 @@ function wp_enqueue_code_editor( $args ) {
 				'Alt-F' => 'findPersistent',
 			),
 			'direction' => 'ltr', // Code is shown in LTR even in RTL languages.
+			'gutters' => array(),
 		),
 		'csslint' => array(
 			'errors' => true, // Parsing errors.