diff --git a/src/components/ADempiere/Field/index.vue b/src/components/ADempiere/Field/index.vue
index 9a2a3266..a5acc6d4 100644
--- a/src/components/ADempiere/Field/index.vue
+++ b/src/components/ADempiere/Field/index.vue
@@ -329,7 +329,7 @@ export default {
   methods: {
     showMessage,
     focusField() {
-      if (this.isDisplayed && this.isMandatory && !this.isReadOnly) {
+      if (this.isDisplayed && !this.isReadOnly) {
         this.$refs[this.field.columnName].activeFocus()
       }
     }
diff --git a/src/components/ADempiere/Panel/index.vue b/src/components/ADempiere/Panel/index.vue
index ae367daf..8b9bc890 100644
--- a/src/components/ADempiere/Panel/index.vue
+++ b/src/components/ADempiere/Panel/index.vue
@@ -680,7 +680,7 @@ export default {
       return new Promise(resolve => {
         const fieldFocus = this.getterFieldList.find(itemField => {
           if (this.$refs.hasOwnProperty(itemField.columnName)) {
-            if (fieldIsDisplayed(itemField) && !itemField.isReadOnly && itemField.isUpdateable) {
+            if (fieldIsDisplayed(itemField) && !itemField.isReadOnly && itemField.isUpdateable && itemField.componentPath !== 'FieldSelect') {
               return true
             }
           }