--- limesurvey.orginal/application/controllers/admin/surveyadmin.php	2018-04-24 15:04:14.000000000 +0200
+++ limesurvey/application/controllers/admin/surveyadmin.php	2018-04-30 13:21:08.796146142 +0200
@@ -1001,6 +1001,17 @@
     }
 
     /**
+     * reload initKc correctly
+     */
+
+    private function _callInitKcFinder($survey)
+    {
+ 	Yii::app()->loadHelper("admin/htmleditor");
+        Yii::app()->session['FileManagerContext'] = "edit:survey:{$survey->sid}";
+        initKcfinder();
+    }
+
+    /**
      * Edit surveytexts and general settings
      */
     public function surveygeneralsettings($iSurveyID)
@@ -1024,7 +1035,7 @@
         //This method creates the text edition and the general settings
         $aData['panels'] = [];
 
-        Yii::app()->loadHelper("admin/htmleditor");
+        $this->_callInitKcFinder($survey);
 
         $aData['scripts'] = PrepareEditorScript(false, $this->getController());
 
@@ -1106,8 +1117,8 @@
             $baselang = Survey::model()->findByPk($iSurveyID)->language;
             array_unshift($grplangs, $baselang);
 
-            Yii::app()->loadHelper("admin/htmleditor");
-
+            $this->_callInitKcFinder($survey);
+		
             $aData['scripts'] = PrepareEditorScript(false, $this->getController());
             $aTabTitles = $aTabContents = array();
 
@@ -1590,7 +1601,7 @@
      */
     private function _getTextEditData($survey)
     {
-        Yii::app()->loadHelper("admin/htmleditor");
+        $this->_callInitKcFinder($survey);
         $aData = $aTabTitles = $aTabContents = array();
 
         $aData['scripts'] = PrepareEditorScript(false, $this->getController());
@@ -1778,9 +1789,7 @@
         $aData['noform'] = true;
 
         //KCFINDER SETTINGS
-        Yii::app()->session['FileManagerContext'] = "edit:survey:{$oSurvey->sid}";
-        Yii::app()->loadHelper('admin.htmleditor');
-        initKcfinder();
+        $this->_callInitKcFinder($survey);
 
         return $aData;
     }