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 a37cd4ee3..5a2cfc422 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -380,7 +380,9 @@ export default {
             console.log('displaySuggestions');
             this.openSuggestPane();
          } else {
-            this.initForm();
+            if (this.flag.datePane === false) {
+               this.initForm(); // reset form except if we come back from datePane
+            }
             this.getCountries(); // will open editPane when resolve promise
          }
       },
@@ -456,11 +458,14 @@ export default {
          fetchCountries().then(
             countries => new Promise((resolve, reject) => {
                this.entity.loaded.countries = countries.results;
+               if (this.flag.showPane === true) {
+                  this.closeShowPane();
+               }
                if (this.flag.suggestPane === true) {
                   this.closeSuggestPane();
                }
-               if (this.flag.showPane === true) {
-                  this.closeShowPane();
+               if (this.flag.datePane === true) {
+                  this.flag.datePane = false;
                }
                console.log('step2: open the Edit panel');
                this.flag.editPane = true;