diff --git a/core/lib/class.plx.motor.php b/core/lib/class.plx.motor.php
index fb4ac0929..c3ef241f6 100644
--- a/core/lib/class.plx.motor.php
+++ b/core/lib/class.plx.motor.php
@@ -842,7 +842,7 @@ public function getCommentaires($motif,$ordre='sort',$start=0,$limite=false,$pub
 			}
 
 			# hiérarchisation et indentation des commentaires seulement sur les écrans requis
-			if (!preg_match('#comments#',basename($_SERVER['SCRIPT_NAME']))) {
+			if (!preg_match('#comments\.php|comment\.php#',basename($_SERVER['SCRIPT_NAME']))) {
 				$array = $this->parentChildSort_r('index', 'parent', $array);
 			}
 
diff --git a/readme/CHANGELOG b/readme/CHANGELOG
index 7fa6c1b3a..0951181fa 100644
--- a/readme/CHANGELOG
+++ b/readme/CHANGELOG
@@ -8,6 +8,7 @@ FIX Error when adding or modifying a user #393 (P3ter)
 FIX Alternative to PHPMailer with sendmail #401 (bazooka07)
 FIX Used of an extern URL as a static page #403 (bazooka07)
 FIX Comments list sorting #419 (P3ter)
+FIX Comment editor is empty #418 (P3ter)
 
 ## PLUXML 5.8.2 (2020/02/09) ##
 [+] #371 Check PluXml update using javascript if "curl" or "file_get_contents" can not be used (bazooka07)