diff --git a/addons/website/static/src/js/editor/editor_menu.js b/addons/website/static/src/js/editor/editor_menu.js
index 0e967b2f679..cd48937b89e 100644
--- a/addons/website/static/src/js/editor/editor_menu.js
+++ b/addons/website/static/src/js/editor/editor_menu.js
@@ -26,8 +26,6 @@ var EditorMenu = Widget.extend({
         request_save: '_onSnippetRequestSave',
     },
 
-    LOCATION_SEARCH: 'enable_editor',
-
     /**
      * @override
      */
@@ -180,12 +178,7 @@ var EditorMenu = Widget.extend({
         $('body').addClass('o_wait_reload');
         this.wysiwyg.destroy();
         window.location.hash = 'scrollTop=' + window.document.body.scrollTop;
-        if (window.location.search.indexOf(this.LOCATION_SEARCH) >= 0) {
-            var regExp = new RegExp('[&?]' + this.LOCATION_SEARCH + '(=[^&]*)?', 'g');
-            window.location.href = window.location.href.replace(regExp, '?');
-        } else {
-            window.location.reload(true);
-        }
+        window.location.reload(true);
         return $.Deferred();
     },
 
diff --git a/addons/website/static/src/js/editor/editor_menu_translate.js b/addons/website/static/src/js/editor/editor_menu_translate.js
index d390c85a949..3016ade659c 100644
--- a/addons/website/static/src/js/editor/editor_menu_translate.js
+++ b/addons/website/static/src/js/editor/editor_menu_translate.js
@@ -54,7 +54,6 @@ var WysiwygTranslate = Wysiwyg.extend({
 });
 
 var TranslatorMenu = EditorMenu.extend({
-    LOCATION_SEARCH: 'edit_translations',
 
     /**
      * @override
diff --git a/addons/website/static/src/js/menu/edit.js b/addons/website/static/src/js/menu/edit.js
index a67e65f4b9b..88a45fb10dc 100644
--- a/addons/website/static/src/js/menu/edit.js
+++ b/addons/website/static/src/js/menu/edit.js
@@ -40,6 +40,8 @@ var EditPageMenu = websiteNavbarData.WebsiteNavbarActionWidget.extend({
             },
         });
         this._editorAutoStart = (context.editable && window.location.search.indexOf('enable_editor') >= 0);
+        var url = window.location.href.replace(/([?&])&*enable_editor[^&#]*&?/, '\$1');
+        window.history.replaceState({}, null, url);
     },
     /**
      * Auto-starts the editor if necessary or add the welcome message otherwise.
diff --git a/addons/website/static/src/js/menu/translate.js b/addons/website/static/src/js/menu/translate.js
index 2359987957f..559f9ef3a25 100644
--- a/addons/website/static/src/js/menu/translate.js
+++ b/addons/website/static/src/js/menu/translate.js
@@ -26,6 +26,9 @@ var TranslatePageMenu = websiteNavbarData.WebsiteNavbarActionWidget.extend({
         });
         this._mustEditTranslations = context.edit_translations;
         if (this._mustEditTranslations) {
+            var url = window.location.href.replace(/([?&])&*edit_translations[^&#]*&?/, '\$1');
+            window.history.replaceState({}, null, url);
+
             this._startTranslateMode();
         }
         return this._super.apply(this, arguments);
@@ -71,6 +74,7 @@ var TranslatePageMenu = websiteNavbarData.WebsiteNavbarActionWidget.extend({
             window.location.search += '&edit_translations';
             return $.Deferred();
         }
+
         var translator = new TranslatorMenu(this);
         return translator.prependTo(document.body);
     },