From 985a7fb6707286cbb294815c990129f23e05a338 Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Mon, 6 Sep 2021 16:47:46 +0300
Subject: [PATCH 1/3] Use only one way to go back

---
 src/components/dialogHelper/dialogHelper.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/dialogHelper/dialogHelper.js b/src/components/dialogHelper/dialogHelper.js
index 5617f2a170..1e4c556a6d 100644
--- a/src/components/dialogHelper/dialogHelper.js
+++ b/src/components/dialogHelper/dialogHelper.js
@@ -87,7 +87,7 @@ import '../../assets/css/scrollstyles.scss';
             if (!self.closedByBack && isHistoryEnabled(dlg)) {
                 const state = window.history.state || {};
                 if (state.dialogId === hash) {
-                    window.history.back();
+                    appRouter.back();
                 }
             }
 
@@ -213,7 +213,7 @@ import '../../assets/css/scrollstyles.scss';
     export function close(dlg) {
         if (isOpened(dlg)) {
             if (isHistoryEnabled(dlg)) {
-                window.history.back();
+                appRouter.back();
             } else {
                 closeDialog(dlg);
             }

From a25e8d99a0de5a1d3ae553581f474b8ffe4bd3f3 Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Mon, 6 Sep 2021 16:49:22 +0300
Subject: [PATCH 2/3] Add dialog id to hashbang

---
 src/components/dialogHelper/dialogHelper.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/dialogHelper/dialogHelper.js b/src/components/dialogHelper/dialogHelper.js
index 1e4c556a6d..8a6a22fd15 100644
--- a/src/components/dialogHelper/dialogHelper.js
+++ b/src/components/dialogHelper/dialogHelper.js
@@ -142,7 +142,7 @@ import '../../assets/css/scrollstyles.scss';
         animateDialogOpen(dlg);
 
         if (isHistoryEnabled(dlg)) {
-            appRouter.show('/dialog', { dialogId: hash });
+            appRouter.show(`/dialog?dlg=${hash}`, { dialogId: hash });
 
             window.addEventListener('popstate', onHashChange);
         } else {

From 796975da412270efa596d18dfc49751fd7eca0cc Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Mon, 6 Sep 2021 16:50:28 +0300
Subject: [PATCH 3/3] Resolve on dialog close

---
 src/components/syncPlay/ui/groupSelectionMenu.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/syncPlay/ui/groupSelectionMenu.js b/src/components/syncPlay/ui/groupSelectionMenu.js
index 96a7310381..4a9f861385 100644
--- a/src/components/syncPlay/ui/groupSelectionMenu.js
+++ b/src/components/syncPlay/ui/groupSelectionMenu.js
@@ -62,7 +62,6 @@ class GroupSelectionMenu {
                     title: globalize.translate('HeaderSyncPlaySelectGroup'),
                     items: menuItems,
                     positionTo: button,
-                    resolveOnClick: true,
                     border: true
                 };
 
@@ -131,7 +130,6 @@ class GroupSelectionMenu {
             title: groupInfo.GroupName,
             items: menuItems,
             positionTo: button,
-            resolveOnClick: true,
             border: true
         };