diff --git a/Services/client/src/modules/01_user/components/AdvancedSearch.vue b/Services/client/src/modules/01_user/components/AdvancedSearch.vue
index bdc151c..4e0390c 100644
--- a/Services/client/src/modules/01_user/components/AdvancedSearch.vue
+++ b/Services/client/src/modules/01_user/components/AdvancedSearch.vue
@@ -145,7 +145,12 @@ function clearAdvSearchData() {
             />
           </div>
           <div class="col-grow">
-            <q-input dense outlined v-model="item.value" placeholder="เอกสาร"
+            <q-input
+              dense
+              outlined
+              v-model="item.value"
+              placeholder="เอกสาร"
+              @keydown.enter.prevent="searchSubmit()"
               ><template v-slot:append>
                 <q-icon
                   name="close"
@@ -184,6 +189,7 @@ function clearAdvSearchData() {
               dense
               outlined
               placeholder="คำสำคัญ:"
+              @keydown.enter.prevent="searchSubmit()"
               v-model="advSearchDataField.keyword"
             />
           </div>
@@ -192,6 +198,7 @@ function clearAdvSearchData() {
               dense
               outlined
               placeholder="รายละเอียด:"
+              @keydown.enter.prevent="searchSubmit()"
               v-model="advSearchDataField.description"
             />
           </div>
diff --git a/Services/client/src/modules/01_user/components/SearchBar.vue b/Services/client/src/modules/01_user/components/SearchBar.vue
index 71e1a7b..58d979d 100644
--- a/Services/client/src/modules/01_user/components/SearchBar.vue
+++ b/Services/client/src/modules/01_user/components/SearchBar.vue
@@ -36,14 +36,10 @@ async function searchSubmit() {
   if (searchData.value.value.trim() !== '') {
     submitSearchData.value = { AND: [], OR: [] }
 
-    submitSearchData.value.AND.push({
+    submitSearchData.value.OR.push({
       field: searchData.value.field,
       value: searchData.value.value,
     })
-    submitSearchData.value.AND.push({
-      field: 'fileName',
-      value: searchData.value.value,
-    })
 
     if (isAdvSearchCall.value && advSearchComp.value) {
       const advField = advSearchComp.value.advSearchDataField