about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/ui/index.jsx
diff options
context:
space:
mode:
authorChristian Schmidt <github@chsc.dk>2023-03-04 23:18:19 +0100
committerGitHub <noreply@github.com>2023-03-04 23:18:19 +0100
commitcb868228bde5351b79041f341a151bb08118d31f (patch)
tree08fb1d0cd8b7a700278e28f107ef5f7e332a7f81 /app/javascript/mastodon/features/ui/index.jsx
parentc599e289d806f6d13e3383879750db053a654821 (diff)
Do not leave Mastodon when clicking “Back” (#23953)
Diffstat (limited to 'app/javascript/mastodon/features/ui/index.jsx')
-rw-r--r--app/javascript/mastodon/features/ui/index.jsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index 4f0ea0450..2dd59f95d 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -474,10 +474,10 @@ class UI extends React.PureComponent {
   };
 
   handleHotkeyBack = () => {
-    if (window.history && window.history.length === 1) {
-      this.context.router.history.push('/');
-    } else {
+    if (window.history && window.history.state) {
       this.context.router.history.goBack();
+    } else {
+      this.context.router.history.push('/');
     }
   };