diff --git a/src/modules/18_command/views/lists.vue b/src/modules/18_command/views/lists.vue
index b708e4a10..2b99e7ac3 100644
--- a/src/modules/18_command/views/lists.vue
+++ b/src/modules/18_command/views/lists.vue
@@ -142,7 +142,7 @@ onMounted(async () => {
       <q-select
         clearable
         @clear="queryParams.page = 1"
-        class="select_ellipsis3"
+        :class="queryParams.commandTypeId ? 'select_ellipsis3' : ''"
         v-model="queryParams.commandTypeId"
         :label="`${'ประเภทคำสั่ง'}`"
         dense
@@ -155,7 +155,7 @@ onMounted(async () => {
         use-input
         @update:model-value="(queryParams.page = 1), fetchListCommand()"
         outlined
-        style="width: 690px"
+        style="width: 620px"
         @filter="(inputValue:string,
           doneFn:Function) => filterSelector(inputValue, doneFn) "
       >
diff --git a/src/style/quasar-variables.sass b/src/style/quasar-variables.sass
index d49781c92..2a73455dd 100644
--- a/src/style/quasar-variables.sass
+++ b/src/style/quasar-variables.sass
@@ -185,4 +185,5 @@ h3.resigtry-tab-title
     white-space: nowrap
     overflow: hidden
     text-overflow: ellipsis
-    width: 550px
+    width: auto
+    max-width: 60ch