diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
index ad11fc02f..d3fe43f87 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -380,15 +380,8 @@ export default {
             console.log('displaySuggestions');
             this.openSuggestPane();
          } else {
-            if (this.flag.suggestPane === true) {
-               this.closeSuggestPane();
-            }
-            if (this.flag.showPane === true) {
-               this.closeShowPane();
-            }
-            console.log('step2: open the Edit panel');
             this.initForm();
-            this.getCountries(); // will open edit pane when resolve promise
+            this.getCountries(); // will open editPane when resolve promise
          }
       },
       closeEditPane() {
@@ -463,6 +456,13 @@ export default {
          fetchCountries().then(
             countries => new Promise((resolve, reject) => {
                this.entity.loaded.countries = countries.results;
+               if (this.flag.suggestPane === true) {
+                  this.closeSuggestPane();
+               }
+               if (this.flag.showPane === true) {
+                  this.closeShowPane();
+               }
+               console.log('step2: open the Edit panel');
                this.flag.editPane = true;
                this.flag.loading = false;
                resolve()
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
index 7a270eafa..7997fbbfa 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
@@ -1,4 +1,4 @@
-<template>step3
+<template>
 
    <div v-if="insideModal === false" class="loading">
       <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
index 61e0f4f8d..9e257fe4a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
@@ -1,4 +1,4 @@
-<template>step2
+<template>
    <div class="address-form">
 
       <!-- Not display in modal -->
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
index 6e0956d3b..fa1a08530 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
@@ -1,4 +1,4 @@
-<template>step1
+<template>
 
    <div v-if="insideModal === false" class="loading">
       <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"></i>