diff --git a/lib/screens/home/communities_admin_panel.dart b/lib/screens/home/communities_admin_panel.dart
index 0bda94e..c7d3626 100644
--- a/lib/screens/home/communities_admin_panel.dart
+++ b/lib/screens/home/communities_admin_panel.dart
@@ -262,6 +262,10 @@ class _CommunitiesAdminPanelState extends State<CommunitiesAdminPanel> {
 
   @override
   Widget build(BuildContext context) {
+    // NOTE: system back is intercepted shell-wide by CreatePostScreen's
+    // PopScope (alive in MainShellScreen's IndexedStack), which switches to
+    // the Home tab on every back press. Adding a PopScope here cannot
+    // override that — use the in-app Back arrow to return to the menu.
     return Scaffold(
       backgroundColor: AppColors.background,
       appBar: AppBar(
@@ -272,6 +276,7 @@ class _CommunitiesAdminPanelState extends State<CommunitiesAdminPanel> {
         leading: _currentPage != AdminPage.menu
             ? IconButton(
                 icon: const Icon(Icons.arrow_back),
+                tooltip: 'Back',
                 onPressed: _navigateBack,
               )
             : null,
diff --git a/lib/screens/home/communities_discovery_screen.dart b/lib/screens/home/communities_discovery_screen.dart
index 3ccc0bc..48155ef 100644
--- a/lib/screens/home/communities_discovery_screen.dart
+++ b/lib/screens/home/communities_discovery_screen.dart
@@ -930,6 +930,9 @@ class _CommunitiesDiscoveryScreenState
             Semantics(
               label: 'See all $title',
               button: true,
+              // Own semantics boundary so screen readers and UI tests see the
+              // button separately from the section title row.
+              container: true,
               child: Material(
                 color: AppColors.teal.withValues(alpha: 0.1),
                 borderRadius: BorderRadius.circular(100),