From 9edb1dd8a17ea016bcbe310b9d636acf86ccde81 Mon Sep 17 00:00:00 2001
From: Damian Stasik <920747+damianstasik@users.noreply.github.com>
Date: Wed, 12 Oct 2022 22:19:53 +0200
Subject: [PATCH 1/2] fix: issue with data browser and back/forward navigation

---
 src/dashboard/Data/Browser/Browser.react.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/dashboard/Data/Browser/Browser.react.js b/src/dashboard/Data/Browser/Browser.react.js
index 9cfecb36ba..22ea20c226 100644
--- a/src/dashboard/Data/Browser/Browser.react.js
+++ b/src/dashboard/Data/Browser/Browser.react.js
@@ -150,13 +150,6 @@ class Browser extends DashboardView {
     this.redirectToFirstClass = this.redirectToFirstClass.bind(this);
 
     this.dataBrowserRef = React.createRef();
-    window.addEventListener('popstate', () => {
-      this.setState({
-        relation: null,
-        data: null,
-      })
-      this.refresh();
-    });
   }
 
   componentWillMount() {

From a1d2a3939509d9892902e624e23c8ed9f06974bf Mon Sep 17 00:00:00 2001
From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com>
Date: Mon, 17 Oct 2022 18:08:51 +0200
Subject: [PATCH 2/2] Update Browser.react.js

---
 src/dashboard/Data/Browser/Browser.react.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/dashboard/Data/Browser/Browser.react.js b/src/dashboard/Data/Browser/Browser.react.js
index 22ea20c226..8e35357351 100644
--- a/src/dashboard/Data/Browser/Browser.react.js
+++ b/src/dashboard/Data/Browser/Browser.react.js
@@ -150,6 +150,12 @@ class Browser extends DashboardView {
     this.redirectToFirstClass = this.redirectToFirstClass.bind(this);
 
     this.dataBrowserRef = React.createRef();
+
+    window.addEventListener('popstate', () => {
+      this.setState({
+        relation: null
+      })
+    });
   }
 
   componentWillMount() {