diff --git a/themes/metro/scss/_rte.scss b/themes/metro/scss/_rte.scss
index ab0fb66bde..783ecd9582 100644
--- a/themes/metro/scss/_rte.scss
+++ b/themes/metro/scss/_rte.scss
@@ -14,9 +14,10 @@
 
   input,
   select,
-  textarea {
+  textarea,
+  .CodeMirror {
     width: 100%;
-    margin: 0;
+    margin: 6px;
     box-sizing: border-box;
     -ms-box-sizing: border-box;
     -moz-box-sizing: border-box;
diff --git a/themes/pmahomme/scss/_rte.scss b/themes/pmahomme/scss/_rte.scss
index 2ff136b870..aadd21e78c 100644
--- a/themes/pmahomme/scss/_rte.scss
+++ b/themes/pmahomme/scss/_rte.scss
@@ -14,9 +14,10 @@
 
   input,
   select,
-  textarea {
+  textarea,
+  .CodeMirror {
     width: 100%;
-    margin: 0;
+    margin: 6px;
     box-sizing: border-box;
   }