diff --git a/package.json b/package.json
index 652fcb89c4..25fed8d955 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.2.0-dev29",
+	"version": "13.2.0-dev31",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 01f6aa35da..e7a2aeec10 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -1,6 +1,6 @@
 <template>
 	<div v-if="show" ref="el" class="fdidabkb" :class="{ slim: narrow, thin: thin_ }" :style="{ background: bg }" @click="onClick">
-		<i @click="window.history.back()" v-if="props.displayBackButton" v-tooltip.noDelay="i18n.ts.goBack" class="icon backButton ph-caret-left ph-bold ph-lg"></i>
+		<i @click="goBack()" v-if="props.displayBackButton" v-tooltip.noDelay="i18n.ts.goBack" class="icon backButton ph-caret-left ph-bold ph-lg"></i>
 		<div v-if="narrow" class="buttons left" @click="openAccountMenu">
 			<MkAvatar v-if="props.displayMyAvatar && $i" class="avatar" :user="$i" :disable-preview="true"/>
 		</div>
@@ -122,6 +122,15 @@ function onTabMousedown(tab: Tab, ev: MouseEvent): void {
 	}
 }
 
+function goBack() {
+	try {
+		history.back();
+	}
+	catch {
+		window.history.back()
+	}
+}
+
 function onTabClick(tab: Tab, ev: MouseEvent): void {
 	if (tab.onClick) {
 		ev.preventDefault();