diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index 02e86cdc3..01634bed6 100755
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -2067,6 +2067,7 @@ FW_makeEdit($$$)
   FW_pO "</td>";
 
   $val =~ s,\\\n,\n,g;
+  $val = FW_htmlEscape($val);
   my $eval = $val;
   $eval = "<pre>$eval</pre>" if($eval =~ m/\n/);
   FW_pO "<td>";
@@ -2348,6 +2349,7 @@ sub
 FW_htmlEscape($)
 {
   my ($txt) = @_;
+  $txt =~ s/&/&amp;/g;
   $txt =~ s/</&lt;/g;
   $txt =~ s/>/&gt;/g;
   return $txt;
diff --git a/fhem/www/codemirror/fhem_codemirror.js b/fhem/www/codemirror/fhem_codemirror.js
index 08d9ac86a..6d5a646da 100644
--- a/fhem/www/codemirror/fhem_codemirror.js
+++ b/fhem/www/codemirror/fhem_codemirror.js
@@ -60,12 +60,12 @@ cm_wait()
     attr[a] = userAttr[a];
 
   loadLink("codemirror/"+attr.theme+".css");
-  if(ltype) {
-    $("head").append(
-      '<style type="text/css">'+
-        '.CodeMirror {height: ' + (window.innerHeight - 150) + 'px;}'+
-      '</style>');
-  }
+  $("head").append(
+    '<style type="text/css">'+
+      (ltype ? 
+      '.CodeMirror {height: ' + (window.innerHeight - 150) + 'px;}':
+      '.CodeMirror {width:  ' + (window.innerWidth  - 300) + 'px;}')+
+    '</style>');
 
   loadScript("codemirror/"+type+".js", function(){
     log("Calling CodeMirror");