diff --git a/app/javascript/mastodon/components/column_back_button.jsx b/app/javascript/mastodon/components/column_back_button.jsx
index 38ffa607a..74a03b093 100644
--- a/app/javascript/mastodon/components/column_back_button.jsx
+++ b/app/javascript/mastodon/components/column_back_button.jsx
@@ -23,9 +23,7 @@ export default class ColumnBackButton extends PureComponent {
if (onClick) {
onClick();
- // Check if there is a previous page in the app to go back to per https://stackoverflow.com/a/70532858/9703201
- // When upgrading to V6, check `location.key !== 'default'` instead per https://github.com/remix-run/history/blob/main/docs/api-reference.md#location
- } else if (router.route.location.key) {
+ } else if (router.history.location?.state?.fromMastodon) {
router.history.goBack();
} else {
router.history.push('/');
diff --git a/app/javascript/mastodon/components/column_header.jsx b/app/javascript/mastodon/components/column_header.jsx
index 89eade262..9d29bbae0 100644
--- a/app/javascript/mastodon/components/column_header.jsx
+++ b/app/javascript/mastodon/components/column_header.jsx
@@ -63,10 +63,12 @@ class ColumnHeader extends PureComponent {
};
handleBackClick = () => {
- if (window.history && window.history.state) {
- this.context.router.history.goBack();
+ const { router } = this.context;
+
+ if (router.history.location?.state?.fromMastodon) {
+ router.history.goBack();
} else {
- this.context.router.history.push('/');
+ router.history.push('/');
}
};
@@ -83,6 +85,7 @@ class ColumnHeader extends PureComponent {
};
render () {
+ const { router } = this.context;
const { title, icon, active, children, pinned, multiColumn, extraButton, showBackButton, intl: { formatMessage }, placeholder, appendContent, collapseIssues } = this.props;
const { collapsed, animating } = this.state;
@@ -126,7 +129,7 @@ class ColumnHeader extends PureComponent {
pinButton = ;
}
- if (!pinned && (multiColumn || showBackButton)) {
+ if (!pinned && ((multiColumn && router.history.location?.state?.fromMastodon) || showBackButton)) {
backButton = (