diff --git a/client/src/modes/handlers/event.rs b/client/src/modes/handlers/event.rs
index 2a2a6cc..8f51904 100644
--- a/client/src/modes/handlers/event.rs
+++ b/client/src/modes/handlers/event.rs
@@ -161,7 +161,8 @@ impl EventHandler {
             match current_mode {
                 AppMode::General => {
                     // Prioritize Admin Panel navigation if it's visible
-                    if app_state.ui.show_admin {
+                    if app_state.ui.show_admin
+                        && auth_state.role.as_deref() == Some("admin") {
                         if admin_nav::handle_admin_navigation(
                             key,
                             config,