diff --git a/src/components/ADempiere/Field/FieldLocation/index.vue b/src/components/ADempiere/Field/FieldLocation/index.vue
index 80e40da0..b96cb646 100644
--- a/src/components/ADempiere/Field/FieldLocation/index.vue
+++ b/src/components/ADempiere/Field/FieldLocation/index.vue
@@ -16,28 +16,26 @@
  along with this program.  If not, see <https:www.gnu.org/licenses/>.
 -->
 <template>
-  <div>
-    <el-popover
-      ref="locationAddress"
-      v-model="isShowedLocationForm"
-      :placement="popoverPlacement"
-      width="300"
-      trigger="manual"
-    >
-      <location-address-form
-        v-if="isShowedLocationForm"
-        :values="localValues"
-        :parent-metadata="metadata"
-      />
-    </el-popover>
-    <el-input
-      v-model="displayedValue"
-      readonly
-      @focus="setShowedLocationForm(true)"
-    >
-      <i slot="prefix" class="el-icon-location-information el-input__icon" />
-    </el-input>
-  </div>
+  <el-popover
+    ref="locationAddress"
+    v-model="isShowedLocationForm"
+    placement="left-end"
+    width="300"
+    trigger="manual"
+  >
+    <location-address-form
+      :values="localValues"
+      :parent-metadata="metadata"
+    />
+    <el-button slot="reference" type="text" style="width: -webkit-fill-available;" @click="setShowedLocationForm(true)">
+      <el-input
+        v-model="displayedValue"
+        readonly
+      >
+        <i slot="prefix" class="el-icon-location-information el-input__icon" />
+      </el-input>
+    </el-button>
+  </el-popover>
 </template>
 
 <script>
diff --git a/src/components/ADempiere/Field/FieldLocation/locationAddressForm.vue b/src/components/ADempiere/Field/FieldLocation/locationAddressForm.vue
index 15572384..f06b285d 100644
--- a/src/components/ADempiere/Field/FieldLocation/locationAddressForm.vue
+++ b/src/components/ADempiere/Field/FieldLocation/locationAddressForm.vue
@@ -42,8 +42,7 @@
           style="min-height: calc(50vh - 84px)"
           class="loading-panel"
         />
-
-        <el-col :span="24">
+        <el-col :span="24" style="padding-left: 12px;padding-right: 12px;padding-top: 3%;padding-bottom: 3%;">
           <samp style="float: right; padding-right: 10px;">
             <el-button
               :disabled="!isLoaded"
diff --git a/src/components/ADempiere/Form/VPOS/BusinessPartner/index.vue b/src/components/ADempiere/Form/VPOS/BusinessPartner/index.vue
index 9f7917ae..bd3c81fa 100644
--- a/src/components/ADempiere/Form/VPOS/BusinessPartner/index.vue
+++ b/src/components/ADempiere/Form/VPOS/BusinessPartner/index.vue
@@ -24,6 +24,7 @@
         placement="right"
         width="400"
         trigger="click"
+        @hide="popoverClose"
       >
         <business-partner-create
           :parent-metadata="parentMetadata"
@@ -402,6 +403,9 @@ export default {
     },
     popoverOpen(value) {
       this.$store.dispatch('changePopover', true)
+    },
+    popoverClose(value) {
+      this.$store.commit('setShowedLocation', false)
     }
   }
 }