diff --git a/application/controllers/AssessmentController.php b/application/controllers/AssessmentController.php
index 3557e7709f6..2c646eaccbf 100644
--- a/application/controllers/AssessmentController.php
+++ b/application/controllers/AssessmentController.php
@@ -78,11 +78,12 @@ public function actionIndex($surveyid)
         $aData['gid'] = null; //important for rendering the sidebar ...(why?)
         Yii::app()->getClientScript()->registerScript(
             "AssessmentsVariables",
-            "var strnogroup = '" . gT("There are no groups available.", "js") . "',\n ';",
+            "var strnogroup = '" . gT("There are no groups available.", "js") . "';",
             LSYii_ClientScript::POS_BEGIN
         );
         App()->getClientScript()->registerScriptFile(App()->getConfig('adminscripts') . 'assessments.js', LSYii_ClientScript::POS_BEGIN);
 
+        PrepareEditorScript(true, $this);
         $this->aData = $aData;
         $this->render('assessments_view', $this->aData);
     }
@@ -269,7 +270,7 @@ private function prepareDataArray(&$aData, $collectEdit = false)
         $aData['assessmentlangs'] = Yii::app()->getConfig("assessmentlangs");
         $aData['baselang'] = $oSurvey->language;
         $aData['subaction'] = gT("Assessments");
-        $aData['gid'] = App()->request->getPost('gid', '');
+        $aData['groupId'] = App()->request->getPost('gid', '');
         return $aData;
     }
 
diff --git a/application/views/assessment/assessments_edit.php b/application/views/assessment/assessments_edit.php
index 1fed91e71dc..a66fd89ab5f 100644
--- a/application/views/assessment/assessments_edit.php
+++ b/application/views/assessment/assessments_edit.php
@@ -115,8 +115,7 @@
                       <div class='col-sm-12'>
                         <div class="htmleditor input-group">
                           <textarea name='assessmentmessage_<?=$assessmentlang?>' class="form-control" id='assessmentmessage_<?=$assessmentlang?>' rows='10' ><?php echo $message;?></textarea>
-                            <?php // todo implement new ekeditor 1580136051118 ?>
-                            <?php //echo getEditor("assessment-text","assessmentmessage_".$assessmentlang, "[".gT("Message:", "js")."]",$surveyid,$gid,null,$action); ?>
+                          <?php echo getEditor("assessment-text","assessmentmessage_".$assessmentlang, "[".gT("Message:", "js")."]",$surveyid,$gid,null,''); ?>
                         </div>
                       </div>
                     </div>
diff --git a/application/views/assessment/assessments_view.php b/application/views/assessment/assessments_view.php
index 6de6398865f..4b228ac8fc2 100644
--- a/application/views/assessment/assessments_view.php
+++ b/application/views/assessment/assessments_view.php
@@ -82,7 +82,8 @@
                             'editId' => $editId,
                             'assessmentlangs' => $assessmentlangs,
                             'baselang' => $baselang,
-                            'groups' => isset($groups) ? $groups : []
+                            'groups' => isset($groups) ? $groups : [],
+                            'gid' => $groupId,
                         ]
                     );
                 ?>