diff --git a/src/Bundle/ChillMainBundle/Form/Extension/CKEditorExtension.php b/src/Bundle/ChillMainBundle/Form/Extension/CKEditorExtension.php
index 6aafc59d2..96751d746 100644
--- a/src/Bundle/ChillMainBundle/Form/Extension/CKEditorExtension.php
+++ b/src/Bundle/ChillMainBundle/Form/Extension/CKEditorExtension.php
@@ -31,7 +31,7 @@ class CKEditorExtension extends AbstractTypeExtension
     {
         $resolver->setDefaults([
             'attr' => [
-                'class' => 'ck ck-editor snippet-markdown'
+                'class' => 'ckeditor snippet-markdown'
             ]
         ]);
     }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/ckeditor5/index.js b/src/Bundle/ChillMainBundle/Resources/public/modules/ckeditor5/index.js
index 0cb22640b..4e91411b5 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/modules/ckeditor5/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/modules/ckeditor5/index.js
@@ -66,7 +66,10 @@ ClassicEditor.defaultConfig = {
     language: 'fr'
 };
 
-let Fields = document.querySelectorAll('textarea');
+
+let Fields = [];
+Fields.push.apply(Fields, document.querySelectorAll('textarea.ckeditor'));
+Fields.push.apply(Fields, document.querySelectorAll('.cf-fields textarea'));
 
 Fields.forEach(function(field) {
     ClassicEditor