diff --git a/modules/module/conf/module.xml b/modules/module/conf/module.xml
index 51479dbfe..03561a901 100644
--- a/modules/module/conf/module.xml
+++ b/modules/module/conf/module.xml
@@ -8,6 +8,8 @@
 
         <action name="dispModuleSkinInfo" type="view" standalone="true" />
 
+        <action name="getModuleAdminModuleList" type="model" standalone="true" />
+
         <action name="dispModuleAdminSelectList" type="view" standalone="true" />
         <action name="dispModuleAdminCopyModule" type="view" standalone="true" />
         <action name="procModuleAdminInsertCategory" type="controller" standalone="true" />
diff --git a/modules/widget/widget.admin.model.php b/modules/module/module.admin.model.php
similarity index 84%
rename from modules/widget/widget.admin.model.php
rename to modules/module/module.admin.model.php
index 1a2635940..3f80d3e99 100644
--- a/modules/widget/widget.admin.model.php
+++ b/modules/module/module.admin.model.php
@@ -1,12 +1,12 @@
 <?php
     /**
-     * @class  widgetAdminModel
+     * @class  moduleAdminModel
      * @author zero (zero@nzeo.com)
      * @version 0.1
-     * @brief  widget 모듈의 AdminModel class
+     * @brief  module 모듈의 AdminModel class
      **/
 
-    class widgetAdminModel extends widget {
+    class moduleAdminModel extends module {
 
         /**
          * @brief 초기화
@@ -17,7 +17,7 @@
         /**
          * @brief 위젯의 경로를 구함
          **/
-        function getWidgetAdminModuleList() {
+        function getModuleAdminModuleList() {
             $args->module_srls = Context::get('module_srls');
             $output = executeQueryArray('module.getModulesInfo', $args);
             if(!$output->toBool() || !$output->data) return new Object();
diff --git a/modules/module/tpl/module_selector.html b/modules/module/tpl/module_selector.html
index 604867deb..8f5e459fd 100644
--- a/modules/module/tpl/module_selector.html
+++ b/modules/module/tpl/module_selector.html
@@ -52,7 +52,7 @@
                     <!--@if($_idx >0)--><tr><!--@end-->
                     <td>{$k}</td>
                     <td>{$v->browser_title}</td>
-                    <td><a href="#" onclick="insertModule('{$id}', {$v->module_srl}, '{$k}', '{$v->browser_title}',{$type=='single'?'false':'true'}); return false;" class="button green"><span>{$type=='single'?$lang->cmd_select:$lang->cmd_insert}</span></a></td>
+                    <td><a href="#" onclick="insertModule('{$id}', {$v->module_srl}, '{$k}', '{str_replace("'","\\'",$v->browser_title)}',{$type=='single'?'false':'true'}); return false;" class="button green"><span>{$type=='single'?$lang->cmd_select:$lang->cmd_insert}</span></a></td>
                     <!--@if($_idx <count($val))--></tr><!--@end-->
                     {@ $_idx ++; }
                     <!--@end-->
@@ -64,7 +64,7 @@
                 <tr>
                     <td>{$k}</td>
                     <td>{$v->browser_title}</td>
-                    <td><a href="#" onclick="insertModule('{$id}', {$v->module_srl}, '{$k}', '{$v->browser_title}',{$type=='single'?'false':'true'}); return false;" class="button green"><span>{$type=='single'?$lang->cmd_select:$lang->cmd_insert}</span></a></td>
+                    <td><a href="#" onclick="insertModule('{$id}', {$v->module_srl}, '{$k}', '{str_replace("'","\\'",$v->browser_title)}',{$type=='single'?'false':'true'}); return false;" class="button green"><span>{$type=='single'?$lang->cmd_select:$lang->cmd_insert}</span></a></td>
                 </tr>
                 <!--@end-->
                 <!--@end-->
diff --git a/modules/widget/conf/module.xml b/modules/widget/conf/module.xml
index 7c23c8497..c19c308aa 100644
--- a/modules/widget/conf/module.xml
+++ b/modules/widget/conf/module.xml
@@ -8,8 +8,6 @@
         <action name="dispWidgetAdminDownloadedList" type="view" standalone="true" admin_index="true" />
         <action name="dispWidgetAdminAddContent" type="view" standalone="true" />
 
-        <action name="getWidgetAdminModuleList" type="model" standalone="true" />
-
         <action name="procWidgetGenerateCode" type="controller" standalone="true" />
         <action name="procWidgetAddContent" type="controller" standalone="true" />
         <action name="procWidgetInsertDocument" type="controller" standalone="true" />
diff --git a/modules/widget/tpl/js/widget_admin.js b/modules/widget/tpl/js/widget_admin.js
index a8ceb5adf..a0a8d43a7 100644
--- a/modules/widget/tpl/js/widget_admin.js
+++ b/modules/widget/tpl/js/widget_admin.js
@@ -260,7 +260,7 @@ function getModuleSrlList(id) {
     params["id"] = id;
 
     var response_tags = new Array("error","message","module_list","id");
-    exec_xml("widget", "getWidgetAdminModuleList", params, completeGetModuleSrlList, response_tags, params);
+    exec_xml("module", "getModuleAdminModuleList", params, completeGetModuleSrlList, response_tags, params);
 }
 
 function completeGetModuleSrlList(ret_obj, response_tags) {
@@ -291,7 +291,7 @@ function getModuleSrl(id) {
     params["id"] = id;
 
     var response_tags = new Array("error","message","module_list","id");
-    exec_xml("widget", "getWidgetAdminModuleList", params, completeGetModuleSrl, response_tags, params);
+    exec_xml("module", "getModuleAdminModuleList", params, completeGetModuleSrl, response_tags, params);
 }
 
 function completeGetModuleSrl(ret_obj, response_tags) {
@@ -324,4 +324,4 @@ xAddEventListener(window,'load',excuteWindowLoadEvent);
 function selectWidget(val){
     var url =current_url.setQuery('selected_widget', val);
     document.location.href = url;
-}
\ No newline at end of file
+}