diff --git a/src/components/Toolbar/Toolbar.react.js b/src/components/Toolbar/Toolbar.react.js
index 4afd681527..fe42e21692 100644
--- a/src/components/Toolbar/Toolbar.react.js
+++ b/src/components/Toolbar/Toolbar.react.js
@@ -9,23 +9,11 @@ import PropTypes from 'lib/PropTypes';
 import React from 'react';
 import Icon from 'components/Icon/Icon.react';
 import styles from 'components/Toolbar/Toolbar.scss';
-import { useNavigate, useNavigationType, NavigationType } from 'react-router-dom';
 
 const Toolbar = props => {
-  const action = useNavigationType();
-  const navigate = useNavigate();
-  let backButton;
-  if (props.relation || (props.filters && props.filters.size && action !== NavigationType.Pop)) {
-    backButton = (
-      <a className={styles.iconButton} onClick={() => navigate(-1)}>
-        <Icon width={32} height={32} fill="#ffffff" name="left-outline" />
-      </a>
-    );
-  }
   return (
     <div className={styles.toolbar}>
       <div className={styles.title}>
-        <div className={styles.nav}>{backButton}</div>
         <div className={styles.titleText}>
           <div className={styles.section}>{props.section}</div>
           <div>
@@ -82,7 +70,6 @@ Toolbar.propTypes = {
   section: PropTypes.string,
   subsection: PropTypes.string,
   details: PropTypes.string,
-  relation: PropTypes.object,
 };
 
 export default Toolbar;
diff --git a/src/components/Toolbar/Toolbar.scss b/src/components/Toolbar/Toolbar.scss
index dcf2a2580b..488b0befe9 100644
--- a/src/components/Toolbar/Toolbar.scss
+++ b/src/components/Toolbar/Toolbar.scss
@@ -30,10 +30,6 @@ body:global(.expanded) {
     height: 80px;
     right: 135px;
 
-    .nav {
-      display: none;
-    }
-
     .titleText {
       display: none;
     }
@@ -46,17 +42,6 @@ body:global(.expanded) {
   bottom: 10px;
 }
 
-.nav {
-  display: inline-block;
-}
-
-.iconButton {
-  display: block;
-  padding-top: 10px;
-  padding-right: 10px;
-  cursor: pointer;
-}
-
 .titleText {
   display: inline-block;
 }
diff --git a/src/dashboard/Data/Browser/Browser.react.js b/src/dashboard/Data/Browser/Browser.react.js
index 57dfe57af3..4eb4aa5df0 100644
--- a/src/dashboard/Data/Browser/Browser.react.js
+++ b/src/dashboard/Data/Browser/Browser.react.js
@@ -752,8 +752,7 @@ class Browser extends DashboardView {
     const queryString = queryParams.toString();
     const url = queryString ? `browser/${source}?${queryString}` : `browser/${source}`;
 
-    // Push new history entry instead of replacing to enable browser back button
-    this.props.navigate(generatePath(this.context, url));
+    this.props.navigate(generatePath(this.context, url), { replace: true });
   }
 
   redirectToFirstClass(classList, context) {
diff --git a/src/dashboard/Data/Browser/BrowserToolbar.react.js b/src/dashboard/Data/Browser/BrowserToolbar.react.js
index 7b842e6fb2..9d25374e81 100644
--- a/src/dashboard/Data/Browser/BrowserToolbar.react.js
+++ b/src/dashboard/Data/Browser/BrowserToolbar.react.js
@@ -296,8 +296,6 @@ const BrowserToolbar = ({
   return (
     <Toolbar
       className={className}
-      relation={relation}
-      filters={filters}
       section={relation ? `Relation <${relation.targetClassName}>` : 'Class'}
       subsection={subsection}
       details={details.join(' \u2022 ')}