diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php
index 1c17a1aaa..7b8bae405 100644
--- a/modules/admin/admin.admin.model.php
+++ b/modules/admin/admin.admin.model.php
@@ -342,7 +342,7 @@
 			if (!$output->data) return new Object();
 
 			$returnObject = new Object();
-			$returnObject->add('favoriteList', $favoriteList);
+			$returnObject->add('favoriteList', $output->data);
 			return $returnObject;
 		}
 
diff --git a/modules/admin/ruleset/toggleFavorite.xml b/modules/admin/ruleset/toggleFavorite.xml
index 0a807b3ba..b2a4e7f1e 100644
--- a/modules/admin/ruleset/toggleFavorite.xml
+++ b/modules/admin/ruleset/toggleFavorite.xml
@@ -3,7 +3,6 @@
 	<customrules />
 	<fields>
 		<field name="site_srl" required="true" rule="number" />
-		<field name="module_name" required="true" />
-		<field name="key" required="true" />
+		<field name="module_name" required="true" />		
     </fields>
 </ruleset>
diff --git a/modules/module/module.admin.view.php b/modules/module/module.admin.view.php
index f50a99990..f145624a7 100644
--- a/modules/module/module.admin.view.php
+++ b/modules/module/module.admin.view.php
@@ -27,7 +27,8 @@
          **/
         function dispModuleAdminList() {            
 			// Obtain a list of modules
-            $oModuleModel = &getModel('module');
+            $oAdminModel = &getAdminModel('admin');
+			$oModuleModel = &getModel('module');			
 			$oAutoinstallModel = &getModel('autoinstall');
 			
 			$module_list = $oModuleModel->getModuleList();
@@ -35,7 +36,17 @@
 				$val->delete_url = $oAutoinstallModel->getRemoveUrlByPath($val->path);										
 			}
 			
-            Context::set('module_list', $module_list);			
+			$output = $oAdminModel->getFavoriteList('0');
+			if($output->toBool()) debugPrint('ok');
+			
+			$favoriteList = $output->variables['favoriteList'];
+			$favoriteModuleList = array();
+			foreach($favoriteList as $favorite => $favorite_info){
+				$favoriteModuleList[] = $favorite_info->module;
+			}
+			
+            Context::set('favoriteModuleList', $favoriteModuleList);
+			Context::set('module_list', $module_list);			
             // Set a template file			
             $this->setTemplateFile('spInstalledModule');
 			
diff --git a/modules/module/tpl/js/module_admin.js b/modules/module/tpl/js/module_admin.js
index fb71fae73..887b01cfb 100644
--- a/modules/module/tpl/js/module_admin.js
+++ b/modules/module/tpl/js/module_admin.js
@@ -3,7 +3,18 @@
  * @author NHN (developers@xpressengine.com)
  * @brief    module 모듈의 관리자용 javascript
  **/
+/* 모듈 즐겨찾기 */
+function doToggleFavoriteModule(module_name) {
+    var params = new Array();
+    params['module_name'] = module_name;
+	params['site_srl'] = '0';		
+    exec_xml('admin','procAdminToggleFavorite',params, completeToggleFavoriteModule);	
+}
 
+function completeToggleFavoriteModule(ret_obj) {    
+    location.reload();
+}
+ 
 /* 카테고리 관련 작업들 */
 function doUpdateCategory(module_category_srl, message) {
     if(typeof(message)!='undefined'&&!confirm(message)) return;
diff --git a/modules/module/tpl/spInstalledModule.html b/modules/module/tpl/spInstalledModule.html
index 6a75aeb72..5f198a66c 100644
--- a/modules/module/tpl/spInstalledModule.html
+++ b/modules/module/tpl/spInstalledModule.html
@@ -1,3 +1,4 @@
+<!--%import("js/module_admin.js")-->
 <div class="content" id="content">
 	<h1 class="h1">Installed Module</h1>
 	<div class="table even easyList">
@@ -7,16 +8,24 @@
 			</caption>
 			<thead>
 				<tr>
+					<th scope="col">즐겨찾기</th>
 					<th scope="col" class="title">{$lang->module_name}</th>
 					<th scope="col">{$lang->version}</th>
 					<th scope="col">{$lang->author}</th>
 					<th scope="col">{$lang->path}</th>
 					<th scope="col">{$lang->cmd_delete}</th>
 				</tr>
-			</thead>
+			</thead>			
 			<tbody>
 				<!--@foreach($module_list as $key => $val)-->
 				<tr>
+					<td>											
+						<!--@if(in_array($val->module,$favoriteModuleList))-->
+						<a href="#" class="fvOn" onClick="doToggleFavoriteModule('{$val->module}')">즐겨찾기(켜짐)</a>
+						<!--@else-->
+						<a href="#" class="fvOff" onClick="doToggleFavoriteModule('{$val->module}')">즐겨찾기(꺼짐)</a>
+						<!--@end-->						
+					</td>
 					<td class="title">
 						<p><a href="{getUrl('','module','admin','act',$val->admin_index_act)}">{$val->title}</a></p>
 						<p>{$val->description}</p>