diff --git a/lib/screens/posts/post_detail.dart b/lib/screens/posts/post_detail.dart
index 5b1421ff..d963e1d0 100644
--- a/lib/screens/posts/post_detail.dart
+++ b/lib/screens/posts/post_detail.dart
@@ -1,3 +1,4 @@
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -56,7 +57,10 @@ class PostDetailScreen extends HookConsumerWidget {
 
     return AppScaffold(
       isNoBackground: false,
-      appBar: AppBar(title: const Text('Post')),
+      appBar: AppBar(
+        leading: const PageBackButton(),
+        title: Text('postDetail').tr(),
+      ),
       body: postState.when(
         data: (post) {
           return Stack(
diff --git a/lib/widgets/app_scaffold.dart b/lib/widgets/app_scaffold.dart
index d4fa3599..f3b6af17 100644
--- a/lib/widgets/app_scaffold.dart
+++ b/lib/widgets/app_scaffold.dart
@@ -235,7 +235,11 @@ class PageBackButton extends StatelessWidget {
     return IconButton(
       onPressed: () {
         onWillPop?.call();
-        context.pop();
+        if (context.canPop()) {
+          context.pop();
+        } else {
+          context.go('/');
+        }
       },
       icon: Icon(
         color: color,