diff --git a/lib/widgets/account/account_popover.dart b/lib/widgets/account/account_popover.dart
index b950cc0..28fe486 100644
--- a/lib/widgets/account/account_popover.dart
+++ b/lib/widgets/account/account_popover.dart
@@ -60,7 +60,7 @@ class AccountPopoverCard extends StatelessWidget {
             IconButton(
               onPressed: () {
                 Navigator.pop(context);
-                GoRouter.of(context).pushNamed(
+                GoRouter.of(context).pushReplacementNamed(
                   'accountProfilePage',
                   pathParameters: {'name': data.name},
                 );
diff --git a/lib/widgets/attachment/attachment_item.dart b/lib/widgets/attachment/attachment_item.dart
index 4140a95..f6f6fae 100644
--- a/lib/widgets/attachment/attachment_item.dart
+++ b/lib/widgets/attachment/attachment_item.dart
@@ -25,6 +25,7 @@ class AttachmentItem extends StatelessWidget {
   final String? heroTag;
   final BoxFit fit;
   final FilterQuality? filterQuality;
+  final Function? onZoom;
 
   const AttachmentItem({
     super.key,
@@ -32,6 +33,7 @@ class AttachmentItem extends StatelessWidget {
     required this.data,
     required this.heroTag,
     this.filterQuality,
+    this.onZoom,
   });
 
   Widget _buildContent(BuildContext context) {
@@ -94,7 +96,14 @@ class AttachmentItem extends StatelessWidget {
       });
     }
 
-    return _buildContent(context);
+    return GestureDetector(
+      child: _buildContent(context),
+      onTap: () {
+        if (data?.mimetype.startsWith('image') ?? false) {
+          onZoom?.call();
+        }
+      },
+    );
   }
 }
 
diff --git a/lib/widgets/attachment/attachment_list.dart b/lib/widgets/attachment/attachment_list.dart
index 7e36325..44063b0 100644
--- a/lib/widgets/attachment/attachment_list.dart
+++ b/lib/widgets/attachment/attachment_list.dart
@@ -74,40 +74,35 @@ class _AttachmentListState extends State<AttachmentList> {
           return Container(
             padding: widget.padding ?? EdgeInsets.zero,
             constraints: constraints,
-            child: GestureDetector(
-              child: AspectRatio(
-                aspectRatio: singleAspectRatio,
-                child: Container(
-                  decoration: BoxDecoration(
-                    color: backgroundColor,
-                    border: Border.fromBorderSide(borderSide),
-                    borderRadius: AttachmentList.kDefaultRadius,
-                  ),
-                  child: ClipRRect(
-                    borderRadius: AttachmentList.kDefaultRadius,
-                    child: AttachmentItem(
-                      data: widget.data[0],
-                      heroTag: heroTags[0],
-                      fit: widget.fit,
-                      filterQuality: widget.filterQuality,
-                    ),
+            child: AspectRatio(
+              aspectRatio: singleAspectRatio,
+              child: Container(
+                decoration: BoxDecoration(
+                  color: backgroundColor,
+                  border: Border.fromBorderSide(borderSide),
+                  borderRadius: AttachmentList.kDefaultRadius,
+                ),
+                child: ClipRRect(
+                  borderRadius: AttachmentList.kDefaultRadius,
+                  child: AttachmentItem(
+                    data: widget.data[0],
+                    heroTag: heroTags[0],
+                    fit: widget.fit,
+                    filterQuality: widget.filterQuality,
+                    onZoom: () {
+                      context.pushTransparentRoute(
+                        AttachmentZoomView(
+                          data: widget.data.where((ele) => ele != null).cast(),
+                          initialIndex: 0,
+                          heroTags: heroTags,
+                        ),
+                        backgroundColor: Colors.black.withOpacity(0.7),
+                        rootNavigator: true,
+                      );
+                    },
                   ),
                 ),
               ),
-              onTap: () {
-                if (widget.data.firstOrNull?.mediaType != SnMediaType.image) {
-                  return;
-                }
-                context.pushTransparentRoute(
-                  AttachmentZoomView(
-                    data: widget.data.where((ele) => ele != null).cast(),
-                    initialIndex: 0,
-                    heroTags: heroTags,
-                  ),
-                  backgroundColor: Colors.black.withOpacity(0.7),
-                  rootNavigator: true,
-                );
-              },
             ),
           );
         }
@@ -133,33 +128,27 @@ class _AttachmentListState extends State<AttachmentList> {
                 mainAxisSpacing: 4,
                 children: widget.data
                     .mapIndexed(
-                      (idx, ele) => GestureDetector(
-                        child: Container(
-                          constraints: constraints,
-                          child: AttachmentItem(
-                            data: ele,
-                            heroTag: heroTags[idx],
-                            fit: BoxFit.cover,
-                            filterQuality: widget.filterQuality,
-                          ),
+                      (idx, ele) => Container(
+                        constraints: constraints,
+                        child: AttachmentItem(
+                          data: ele,
+                          heroTag: heroTags[idx],
+                          fit: BoxFit.cover,
+                          filterQuality: widget.filterQuality,
+                          onZoom: () {
+                            context.pushTransparentRoute(
+                              AttachmentZoomView(
+                                data: widget.data
+                                    .where((ele) => ele != null)
+                                    .cast(),
+                                initialIndex: idx,
+                                heroTags: heroTags,
+                              ),
+                              backgroundColor: Colors.black.withOpacity(0.7),
+                              rootNavigator: true,
+                            );
+                          },
                         ),
-                        onTap: () {
-                          if (widget.data[idx]!.mediaType !=
-                              SnMediaType.image) {
-                            return;
-                          }
-                          context.pushTransparentRoute(
-                            AttachmentZoomView(
-                              data: widget.data
-                                  .where((ele) => ele != null)
-                                  .cast(),
-                              initialIndex: idx,
-                              heroTags: heroTags,
-                            ),
-                            backgroundColor: Colors.black.withOpacity(0.7),
-                            rootNavigator: true,
-                          );
-                        },
                       ),
                     )
                     .toList(),