diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts
index 6957f34d7..c66171e3a 100644
--- a/src/client/app/desktop/script.ts
+++ b/src/client/app/desktop/script.ts
@@ -126,7 +126,8 @@ init(async (launch, os) => {
 
 	os.store.commit('device/set', {
 		key: 'inDeckMode',
-		value: os.store.getters.isSignedIn && os.store.state.device.deckMode && document.location.pathname === '/'
+		value: os.store.getters.isSignedIn && os.store.state.device.deckMode
+			&& (document.location.pathname === '/' || window.performance.navigation.type === 1)
 	});
 
 	// Init router
diff --git a/src/client/app/desktop/views/components/ui.header.account.vue b/src/client/app/desktop/views/components/ui.header.account.vue
index 37983285c..132605504 100644
--- a/src/client/app/desktop/views/components/ui.header.account.vue
+++ b/src/client/app/desktop/views/components/ui.header.account.vue
@@ -166,7 +166,7 @@ export default Vue.extend({
 		},
 		toggleDeckMode() {
 			this.$store.commit('device/set', { key: 'deckMode', value: !this.$store.state.device.inDeckMode });
-			location.reload();
+			location.replace('/');
 		},
 	}
 });
diff --git a/src/client/app/desktop/views/components/ui.sidebar.vue b/src/client/app/desktop/views/components/ui.sidebar.vue
index c404d03a1..a0fca8102 100644
--- a/src/client/app/desktop/views/components/ui.sidebar.vue
+++ b/src/client/app/desktop/views/components/ui.sidebar.vue
@@ -122,7 +122,7 @@ export default Vue.extend({
 	methods: {
 		toggleDeckMode(deck) {
 			this.$store.commit('device/set', { key: 'deckMode', value: deck });
-			location.reload();
+			location.replace('/');
 		},
 
 		onReversiInvited() {