diff --git a/admin-spa/src/routes/Settings/Notifications/EditTemplate.tsx b/admin-spa/src/routes/Settings/Notifications/EditTemplate.tsx
index 6595e74..d922859 100644
--- a/admin-spa/src/routes/Settings/Notifications/EditTemplate.tsx
+++ b/admin-spa/src/routes/Settings/Notifications/EditTemplate.tsx
@@ -340,7 +340,7 @@ export default function EditTemplate() {
           <Button
             variant="ghost"
             size="sm"
-            onClick={() => navigate(-1)}
+            onClick={() => navigate(`/settings/notifications?tab=${channelId}&event=${eventId}`)}
             className="gap-2"
             title={__('Back')}
           >
diff --git a/admin-spa/src/routes/Settings/Notifications/Templates.tsx b/admin-spa/src/routes/Settings/Notifications/Templates.tsx
index 99598a0..a1eab4d 100644
--- a/admin-spa/src/routes/Settings/Notifications/Templates.tsx
+++ b/admin-spa/src/routes/Settings/Notifications/Templates.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
-import { useNavigate } from 'react-router-dom';
+import React, { useEffect, useState } from 'react';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import { useQuery } from '@tanstack/react-query';
 import { api } from '@/lib/api';
 import { SettingsCard } from '../components/SettingsCard';
@@ -25,6 +25,16 @@ interface NotificationChannel {
 
 export default function NotificationTemplates() {
   const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
+  const [openAccordion, setOpenAccordion] = useState<string | undefined>();
+
+  // Check for query params to open specific accordion
+  useEffect(() => {
+    const eventParam = searchParams.get('event');
+    if (eventParam) {
+      setOpenAccordion(eventParam);
+    }
+  }, [searchParams]);
 
   // Fetch channels
   const { data: channels, isLoading: channelsLoading } = useQuery({
@@ -102,7 +112,7 @@ export default function NotificationTemplates() {
         title={__('Templates by Channel')}
         description={__('Customize notification templates for each channel')}
       >
-        <Accordion type="single" collapsible className="w-full">
+        <Accordion type="single" collapsible className="w-full" value={openAccordion} onValueChange={setOpenAccordion}>
           {channels?.map((channel: NotificationChannel) => {
             const channelTemplates = allEvents.filter((event: any) => {
               const templateKey = `${event.id}_${channel.id}`;