diff --git a/frappe/www/message.html b/frappe/www/message.html
index 2919592901..db9deeba1f 100644
--- a/frappe/www/message.html
+++ b/frappe/www/message.html
@@ -39,8 +39,8 @@ html, body {
 {% endif %}
 <script>
 	frappe.ready(function() {
-		if(window.location.hash) {
-			localStorage.setItem('session_last_route', window.location.hash.substr(1));
+		if (window.location.hash || window.location.href.includes('/app')) {
+			localStorage.setItem('session_last_route', window.location.pathname + window.location.hash + window.location.search);
 		}
 
 		$('.btn-primary').focus();