diff --git a/modules/board/tpl/board_insert.html b/modules/board/tpl/board_insert.html
index 345aa77d7..711005765 100644
--- a/modules/board/tpl/board_insert.html
+++ b/modules/board/tpl/board_insert.html
@@ -71,7 +71,7 @@
         <td>
             <select name="skin">
                 <!--@foreach($skin_list as $key=>$val)-->
-                <option value="{$key}" <!--@if($module_info->skin==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
+                <option value="{$key}" <!--@if($module_info->skin==$key ||(!$module_info->skin && $key=='xe_board'))-->selected="selected"<!--@end-->>{$val->title}</option>
                 <!--@end-->
             </select>
             <p>{$lang->about_skin}</p>
diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php
index cc572ce90..528737f51 100644
--- a/modules/document/document.admin.controller.php
+++ b/modules/document/document.admin.controller.php
@@ -149,8 +149,8 @@
                 unset($obj);
                 $obj = $oDocument->getObjectVars();
 
-                // 첨부파일 이동
-                if($oDocument->hasUploadedFiles()) {
+                // 대상 모듈이 다를 경우 첨부파일 이동
+                if($module_srl != $obj->module_srl && $oDocument->hasUploadedFiles()) {
                     $oFileController = &getController('file');
 
                     $files = $oDocument->getUploadedFiles();
diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php
index 531374283..1f965bb5f 100644
--- a/modules/document/document.admin.view.php
+++ b/modules/document/document.admin.view.php
@@ -156,7 +156,7 @@
 
 
             // 모듈 카테고리 목록과 모듈 목록의 조합
-            Context::set('module_list', $module_categories);
+            if(count($module_list)>1) Context::set('module_list', $module_categories);
 
             // 팝업 레이아웃 선택
             $this->setLayoutPath('./common/tpl');
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index b28c6d20e..5cae365a1 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -731,7 +731,10 @@
 
             $category_list = $output->data;
 
-            if(!$category_list) return false;
+            if(!$category_list) {
+                @unlink($xml_file);
+                @unlink($php_file);
+            }
             if(!is_array($category_list)) $category_list = array($category_list);
 
             $category_count = count($category_list);
diff --git a/modules/document/tpl/checked_list.html b/modules/document/tpl/checked_list.html
index e6ff35506..2c40b1cf0 100644
--- a/modules/document/tpl/checked_list.html
+++ b/modules/document/tpl/checked_list.html
@@ -1,7 +1,6 @@
 <!--%import("filter/manage_checked_document.xml")-->
 <!--%import("js/document_admin.js")-->
 <!--%import("css/document.css")-->
-
 <div id="popHeadder">
     <h3>{$lang->cmd_manage_document}</h3>
 </div>
@@ -28,7 +27,7 @@
             <!--@end-->
         </td>
     </tr>
-    <!--@if(count($document_list) && count($module_list)>1)-->
+    <!--@if(count($document_list) && $module_list)-->
     <tr>
         <th scope="row">{$lang->move_target_module}</th>
         <td>