diff --git a/modules/file/file.admin.model.php b/modules/file/file.admin.model.php
index c10675fc4..1bb074c63 100644
--- a/modules/file/file.admin.model.php
+++ b/modules/file/file.admin.model.php
@@ -84,14 +84,12 @@ class fileAdminModel extends file
 		{
 			$args->document_status = array('PUBLIC');
 			$args->comment_is_secret = array('N');
+			$output = executeQuery('file.getFileListByTargetStatus', $args, $columnList);
 		}
 		else
 		{
-			$args->document_status = array('PUBLIC', 'PRIVATE', 'SECRET', 'TEMP');
-			$args->comment_is_secret = array('Y', 'N');
+			$output = executeQuery('file.getFileList', $args, $columnList);
 		}
-		// Execute the file.getFileList query
-		$output = executeQuery('file.getFileList', $args, $columnList);
 		// Return if no result or an error occurs
 		if(!$output->toBool()||!count($output->data)) return $output;
 
diff --git a/modules/file/queries/getFileList.xml b/modules/file/queries/getFileList.xml
index 7092da25f..023366f29 100644
--- a/modules/file/queries/getFileList.xml
+++ b/modules/file/queries/getFileList.xml
@@ -6,16 +6,6 @@
                 <condition operation="equal" column="files.member_srl" default="member.member_srl" />
             </conditions>
         </table>
-        <table name="documents" type="left join">
-            <conditions>
-                <condition operation="equal" column="files.upload_target_srl" default="documents.document_srl" />
-            </conditions>
-        </table>
-        <table name="comments" type="left join">
-            <conditions>
-                <condition operation="equal" column="files.upload_target_srl" default="comments.comment_srl" />
-            </conditions>
-        </table>
     </tables>
     <columns>
         <column name="files.*" />
@@ -26,14 +16,6 @@
         <condition operation="equal" column="files.isvalid" var="isvalid" pipe="and" />
         <condition operation="equal" column="files.direct_download" var="direct_download" pipe="and" />
 		<condition operation="below" column="files.regdate" var="regdate_before" pipe="and" />
-		<group pipe="and">
-			<condition operation="in" column="documents.status" var="document_status" />
-			<condition operation="null" column="documents.status" pipe="or" />
-		</group>
-		<group pipe="and">
-			<condition operation="in" column="comments.is_secret" var="comment_is_secret" />
-			<condition operation="null" column="comments.is_secret" pipe="or" />
-		</group>
         <group pipe="and">
             <condition operation="like" column="files.source_filename" var="s_filename" pipe="or" />
             <condition operation="more" column="files.file_size" var="s_filesize_more" pipe="or" />
diff --git a/modules/file/queries/getFileListByTargetStatus.xml b/modules/file/queries/getFileListByTargetStatus.xml
new file mode 100644
index 000000000..7092da25f
--- /dev/null
+++ b/modules/file/queries/getFileListByTargetStatus.xml
@@ -0,0 +1,55 @@
+<query id="getFileList" action="select">
+    <tables>
+        <table name="files" alias="files" />
+        <table name="member" type="left join">
+            <conditions>
+                <condition operation="equal" column="files.member_srl" default="member.member_srl" />
+            </conditions>
+        </table>
+        <table name="documents" type="left join">
+            <conditions>
+                <condition operation="equal" column="files.upload_target_srl" default="documents.document_srl" />
+            </conditions>
+        </table>
+        <table name="comments" type="left join">
+            <conditions>
+                <condition operation="equal" column="files.upload_target_srl" default="comments.comment_srl" />
+            </conditions>
+        </table>
+    </tables>
+    <columns>
+        <column name="files.*" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="files.module_srl" var="s_module_srl" />
+        <condition operation="notin" column="files.module_srl" var="exclude_module_srl" pipe="and" />
+        <condition operation="equal" column="files.isvalid" var="isvalid" pipe="and" />
+        <condition operation="equal" column="files.direct_download" var="direct_download" pipe="and" />
+		<condition operation="below" column="files.regdate" var="regdate_before" pipe="and" />
+		<group pipe="and">
+			<condition operation="in" column="documents.status" var="document_status" />
+			<condition operation="null" column="documents.status" pipe="or" />
+		</group>
+		<group pipe="and">
+			<condition operation="in" column="comments.is_secret" var="comment_is_secret" />
+			<condition operation="null" column="comments.is_secret" pipe="or" />
+		</group>
+        <group pipe="and">
+            <condition operation="like" column="files.source_filename" var="s_filename" pipe="or" />
+            <condition operation="more" column="files.file_size" var="s_filesize_more" pipe="or" />
+            <condition operation="less" column="files.file_size" var="s_filesize_less" pipe="or" />
+            <condition operation="more" column="files.download_count" var="s_download_count" pipe="or" />
+            <condition operation="like_prefix" column="files.regdate" var="s_regdate" pipe="or" />
+            <condition operation="like_prefix" column="files.ipaddress" var="s_ipaddress" pipe="or" />
+            <condition operation="like" column="member.user_id" var="s_user_id" pipe="or" />
+            <condition operation="like" column="member.user_name" var="s_user_name" pipe="or" />
+            <condition operation="like" column="member.nick_name" var="s_nick_name" pipe="or" />
+        </group>
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="files.file_srl" order="desc" />
+        <list_count var="list_count" default="20" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>