diff --git a/Kernel/Modules/AdminDynamicFieldLens.pm b/Kernel/Modules/AdminDynamicFieldLens.pm
index 6b226a3f6..23eca6db4 100644
--- a/Kernel/Modules/AdminDynamicFieldLens.pm
+++ b/Kernel/Modules/AdminDynamicFieldLens.pm
@@ -56,7 +56,7 @@ sub new {
         # see https://github.com/RotherOSS/issues/3186
         CustomerUser => 0,
 
-        # see https://github.com/RotherOSS/otobo/issues/3793
+        # see https://github.com/RotherOSS/otobo/issues/3534
         Database => 0,
         Date     => 1,
         DateTime => 1,
@@ -75,9 +75,7 @@ sub new {
         # see https://github.com/RotherOSS/otobo/issues/3789
         Lens        => 0,
         Multiselect => 1,
-
-        # see https://github.com/RotherOSS/otobo/issues/3720 and https://github.com/RotherOSS/otobo/issues/3815
-        RichText => 0,
+        RichText    => 1,
 
         # see https://github.com/RotherOSS/otobo/issues/3810
         ScriptTemplateToolkit => 0,
diff --git a/Kernel/Output/HTML/DynamicField/Mask.pm b/Kernel/Output/HTML/DynamicField/Mask.pm
index 67ef9f45f..afb67c076 100644
--- a/Kernel/Output/HTML/DynamicField/Mask.pm
+++ b/Kernel/Output/HTML/DynamicField/Mask.pm
@@ -172,9 +172,21 @@ sub EditSectionRender {
                 next FIELD;
             }
 
-            my $DynamicField = $Param{DynamicFields}{ $Field->{DF} };
-            my $DFName       = "DynamicField_$Field->{DF}";
-            my $FieldClasses = 'Field' . ( $DynamicField->{FieldType} eq 'RichText' ? ' RichTextField' : '' );
+            my $DynamicField    = $Param{DynamicFields}{ $Field->{DF} };
+            my $DFName          = "DynamicField_$Field->{DF}";
+            my $IsRichTextField = 0;
+            if ( $DynamicField->{FieldType} eq 'RichText' ) {
+                $IsRichTextField = 1;
+            }
+            elsif ( $DynamicField->{FieldType} eq 'Lens' ) {
+                my $AttributeDF = $Kernel::OM->Get('Kernel::System::DynamicField')->DynamicFieldGet(
+                    ID => $DynamicField->{Config}{AttributeDF},
+                );
+                if ( $AttributeDF->{FieldType} eq 'RichText' ) {
+                    $IsRichTextField = 1;
+                }
+            }
+            my $FieldClasses = 'Field' . ( $IsRichTextField ? ' RichTextField' : '' );
 
             # don't set a default value for hidden fields
             my %InvisibleNoDefault;