diff --git a/app/portainer/services/codeMirror.js b/app/portainer/services/codeMirror.js
index 0148500a1..38bb10259 100644
--- a/app/portainer/services/codeMirror.js
+++ b/app/portainer/services/codeMirror.js
@@ -15,10 +15,10 @@ angular.module('portainer.app')
   var service = {};
 
   service.applyCodeMirrorOnElement = function(element, yamlLint, readOnly) {
-    var options = codeMirrorGenericOptions;
+    var options = angular.copy(codeMirrorGenericOptions);
 
     if (yamlLint) {
-      options = codeMirrorYAMLOptions;
+      _.assign(options, codeMirrorYAMLOptions);
     }
 
     if (readOnly) {