diff --git a/core/modules/toolbar/js/escapeAdmin.js b/core/modules/toolbar/js/escapeAdmin.js index d08a72f..7c83971 100644 --- a/core/modules/toolbar/js/escapeAdmin.js +++ b/core/modules/toolbar/js/escapeAdmin.js @@ -10,8 +10,10 @@ var escapeAdminPath = sessionStorage.getItem('escapeAdminPath'); // Saves the last non-administrative page in the browser to be able to link back -// to it when browsing administrative pages. -if (!drupalSettings.currentPathIsAdmin) { +// to it when browsing administrative pages. If there is a destination parameter +// there is not need to save the current path because the page is loaded within +// an existing "workflow". +if (!drupalSettings.currentPathIsAdmin && !/destination=/.test(window.location.search)) { sessionStorage.setItem('escapeAdminPath', drupalSettings.currentPath); }