diff --git a/module/editor/control.php b/module/editor/control.php
index 5e94e2d125..f3956a5ffd 100644
--- a/module/editor/control.php
+++ b/module/editor/control.php
@@ -50,6 +50,8 @@ class editor extends control
      */
     public function extend($moduleDir = '')
     {
+        if(!isset($this->lang->{$moduleDir}->common)) $this->app->loadLang($moduleDir);
+
         $moduleFiles = $this->editor->getModuleFiles($moduleDir);
         $this->view->module = $moduleDir;
         $this->view->tree   = $this->editor->printTree($moduleFiles);
diff --git a/module/editor/css/extend.css b/module/editor/css/extend.css
index e019a90efa..a9ad22f8ae 100644
--- a/module/editor/css/extend.css
+++ b/module/editor/css/extend.css
@@ -3,3 +3,4 @@ body{padding-bottom:0px;background-color:#fff;}
 .collapsable > ul {display: block!important}
 .tree li:before {margin-right: 4px;}
 .tree li>a{display:inline;}
+.main-content{padding: 0px; padding-top: 20px;}
diff --git a/module/editor/model.php b/module/editor/model.php
index df5ef584e4..4598e6838f 100644
--- a/module/editor/model.php
+++ b/module/editor/model.php
@@ -25,6 +25,7 @@ class editorModel extends model
         foreach($this->config->editor->sort as $name)
         {
             $moduleFullFile = $modulePath . $name;
+            if(!file_exists($moduleFullFile)) continue;
             if($name == 'control.php' or $name == 'model.php')
             {
                 $allModules[$modulePath][$moduleFullFile] = $this->analysis($moduleFullFile);
@@ -204,9 +205,15 @@ class editorModel extends model
     {
         $tree     = '';
         $fileName = basename($filePath);
-        $file     = "<span title='$fileName'>$fileName</span>";
-        if(isset($this->lang->editor->modules[$fileName]))   $file = "<span title='$fileName'>" . $this->lang->editor->modules[$fileName]   . '</span>';
-        if(isset($this->lang->editor->translate[$fileName])) $file = "<span title='$fileName'>" . $this->lang->editor->translate[$fileName] . '</span>';
+        if(isset($this->lang->editor->translate[$fileName]))
+        {
+            $file = "<span title='$fileName'>" . $this->lang->editor->translate[$fileName] . '</span>';
+        }
+        else
+        {
+            $moduleName = zget($this->lang->editor->modules, $fileName, isset($this->lang->{$fileName}->common) ? $this->lang->{$fileName}->common : $fileName);
+            $file = "<span title='{$fileName}'>{$moduleName}</span>";
+        }
 
         if(strpos($filePath, DS . 'ext' . DS) !== false)
         {