diff --git a/modules/trash/tpl/trash_list.html b/modules/trash/tpl/trash_list.html
index 6a252cb8f..6cabb10ec 100644
--- a/modules/trash/tpl/trash_list.html
+++ b/modules/trash/tpl/trash_list.html
@@ -56,7 +56,7 @@ var no_text_comment = '{$lang->no_text_comment}';
 				<td class="title">
 					<!--@if(trim($oTrashVO->getTitle()))-->
 					<!--@if(isset($module_list[$oTrashVO->unserializedObject['module_srl']]))-->
-					<a href="{getUrl('', 'mid', $module_list[$oTrashVO->unserializedObject['module_srl']]->mid)}" target="_blank">{$module_list[$oTrashVO->unserializedObject['module_srl']]->browser_title}</a> - 
+					<a href="{getUrl('', 'mid', $module_list[$oTrashVO->unserializedObject['module_srl']]->mid)}" target="_blank">{$module_list[$oTrashVO->unserializedObject['module_srl']]->browser_title}</a> -
 					<!--@end-->
 					<a href="{getUrl('act','dispTrashAdminView','trash_srl',$oTrashVO->getTrashSrl())}">{$oTrashVO->getTitle()}</a>
 					<!--@else-->
@@ -129,10 +129,10 @@ var no_text_comment = '{$lang->no_text_comment}';
 	<input type="hidden" name="error_return_url" value="" />
 	<select name="search_target" title="{$lang->search_target}" style="margin-right:4px">
 		<!--@foreach($lang->search_target_trash_list as $key => $val)-->
-		<option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
+		<option value="{$key}" selected="selected"|cond="isset($search_target) && $search_target == $key">{$val}</option>
 		<!--@end-->
 	</select>
-	<input type="search" name="search_keyword" value="{htmlspecialchars($search_keyword, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}" title="{$lang->cmd_search}" />
+	<input type="search" name="search_keyword" value="{escape($search_keyword ?? '', false)}" title="{$lang->cmd_search}" />
 	<button type="submit" class="x_btn x_btn-inverse">{$lang->cmd_search}</button>
 	<a href="{getUrl('','module',$module,'act',$act)}" class="x_btn">{$lang->cmd_cancel}</a>
 </form>
diff --git a/modules/trash/trash.admin.view.php b/modules/trash/trash.admin.view.php
index 277b08e44..f965dcf99 100644
--- a/modules/trash/trash.admin.view.php
+++ b/modules/trash/trash.admin.view.php
@@ -59,6 +59,7 @@ class TrashAdminView extends Trash
 		$oTrashModel = getModel('trash');
 		$output = $oTrashModel->getTrashList($args);
 
+		Context::set('originModule', strval($args->originModule));
 		Context::set('trash_list', $output->data);
 		Context::set('total_count', $output->total_count);
 		Context::set('total_page', $output->total_page);