diff --git a/src/components/ADempiere/DefaultTable/index.vue b/src/components/ADempiere/DefaultTable/index.vue
index 835e0b7f09a..8b9c6184086 100644
--- a/src/components/ADempiere/DefaultTable/index.vue
+++ b/src/components/ADempiere/DefaultTable/index.vue
@@ -19,7 +19,7 @@
 <template>
   <el-main class="default-table">
     <el-row>
-      <el-col :span="23">
+      <el-col v-if="isShowSearch" :span="24">
         <el-input
           v-model="valueToSearch"
           clearable
@@ -32,11 +32,6 @@
           />
         </el-input>
       </el-col>
-      <el-col :span="1">
-        <columns-display-option
-          :option="currentOption"
-        />
-      </el-col>
     </el-row>
 
     <el-table
@@ -70,7 +65,7 @@
           :column-key="fieldAttributes.columnName"
           :prop="fieldAttributes.columnName"
           sortable
-          min-width="200"
+          min-width="210"
           :fixed="fieldAttributes.isFixedTableColumn"
         >
           <template slot-scope="scope">
@@ -85,6 +80,16 @@
           </template>
         </el-table-column>
       </template>
+      <el-table-column
+        fixed="right"
+        width="50"
+      >
+        <template slot="header">
+          <columns-display-option
+            :option="currentOption"
+          />
+        </template>
+      </el-table-column>
     </el-table>
 
     <!-- pagination table, set custom or use default change page method -->
@@ -154,6 +159,10 @@ export default defineComponent({
     isTableSelection: {
       type: Boolean,
       default: true
+    },
+    isShowSearch: {
+      type: Boolean,
+      default: true
     }
   },
 
@@ -179,6 +188,20 @@ export default defineComponent({
       })
     })
 
+    const sizeOption = computed(() => {
+      if (props.isShowSearch) {
+        return 1
+      }
+      return 24
+    })
+
+    const styleOption = computed(() => {
+      if (props.isShowSearch) {
+        return ''
+      }
+      return 'text-align: end; padding-right: 5px;'
+    })
+
     /**
      * Selection columns to be taken into account during the search
      */
@@ -302,6 +325,8 @@ export default defineComponent({
       valueToSearch,
       // computeds
       headerList,
+      sizeOption,
+      styleOption,
       recordsWithFilter,
       currentOption,
       keyColumn,
diff --git a/src/views/ADempiere/Browser/index.vue b/src/views/ADempiere/Browser/index.vue
index 6c4d1cc075a..1e594dc2da4 100644
--- a/src/views/ADempiere/Browser/index.vue
+++ b/src/views/ADempiere/Browser/index.vue
@@ -63,6 +63,7 @@
         :header="tableHeader"
         :data-table="recordsList"
         :record-count="recordCount"
+        :is-show-search="false"
       />
     </el-main>
   </el-container>