diff --git a/Services/client/src/components/TreeExplorer.vue b/Services/client/src/components/TreeExplorer.vue
index d2b44dc..51be85e 100644
--- a/Services/client/src/components/TreeExplorer.vue
+++ b/Services/client/src/components/TreeExplorer.vue
@@ -1,5 +1,11 @@
 <script setup lang="ts">
+import { storeToRefs } from 'pinia'
 import { useTreeDataStore, type TreeDataFolder } from '@/stores/tree-data'
+import { useSearchDataStore } from '@/stores/searched-data'
+import { useFileInfoStore } from '@/stores/file-info-data'
+
+const { isSearch } = storeToRefs(useSearchDataStore())
+const { isPreview } = storeToRefs(useFileInfoStore())
 const { getFolder } = useTreeDataStore()
 
 const props = withDefaults(
@@ -17,7 +23,13 @@ const props = withDefaults(
   <div>
     <q-list v-for="folder in data" class="rounded-borders">
       <q-expansion-item
-        @click="() => getFolder(folder.pathname, false)"
+        @click="
+          () => {
+            getFolder(folder.pathname, false)
+            isSearch = false
+            isPreview = false
+          }
+        "
         :header-inset-level="level * 0.25"
         :group="level.toString()"
         :hide-expand-icon="level === 4"
diff --git a/Services/client/src/modules/01_user/components/SearchBar.vue b/Services/client/src/modules/01_user/components/SearchBar.vue
index 807fa6d..633bf61 100644
--- a/Services/client/src/modules/01_user/components/SearchBar.vue
+++ b/Services/client/src/modules/01_user/components/SearchBar.vue
@@ -10,10 +10,9 @@ import { useSearchDataStore } from '@/stores/searched-data'
 import { useLoader } from '@/stores/loader'
 
 const loaderStore = useLoader()
-const { isSearch } = storeToRefs(useSearchDataStore())
+const { isSearch, isAdvSearchCall } = storeToRefs(useSearchDataStore())
 const { getFoundFile } = useSearchDataStore()
 const advSearchComp = ref<InstanceType<typeof AdvancedSearch>>()
-const isAdvSearchCall = ref<boolean>(false)
 const optionsField = [
   { label: 'ชื่อเรื่อง (title)', value: 'title' },
   { label: 'คำสำคัญ (keyword)', value: 'keyword' },
diff --git a/Services/client/src/stores/searched-data.ts b/Services/client/src/stores/searched-data.ts
index 78ffcf1..595b280 100644
--- a/Services/client/src/stores/searched-data.ts
+++ b/Services/client/src/stores/searched-data.ts
@@ -4,6 +4,7 @@ import type { EhrFile } from '@/stores/tree-data'
 
 export const useSearchDataStore = defineStore('searched', () => {
   const foundFile = ref<EhrFile[]>([])
+  const isAdvSearchCall = ref<boolean>(false)
   const isSearch = ref<Boolean>(false)
 
   async function getFoundFile(data: EhrFile[]) {
@@ -11,8 +12,9 @@ export const useSearchDataStore = defineStore('searched', () => {
   }
 
   return {
-    isSearch,
     foundFile,
+    isSearch,
+    isAdvSearchCall,
     getFoundFile,
   }
 })