diff --git a/src/lib/client/notifications-client.ts b/src/lib/client/notifications-client.ts
index f549eb36..b4a93178 100644
--- a/src/lib/client/notifications-client.ts
+++ b/src/lib/client/notifications-client.ts
@@ -1,6 +1,6 @@
 import { resolve } from "$app/paths";
 import clientResolver from "$lib/client/resolver.js";
-import type { NotificationEvent } from "$lib/server/controllers/dashboardController.js";
+import type { NotificationEvent } from "$lib/types/notifications.js";
 
 interface NotificationsResponse {
   notifications?: NotificationEvent[];
diff --git a/src/lib/components/NotificationsList.svelte b/src/lib/components/NotificationsList.svelte
index 9c4e9cdf..0eef328a 100644
--- a/src/lib/components/NotificationsList.svelte
+++ b/src/lib/components/NotificationsList.svelte
@@ -6,7 +6,7 @@
   import { Button } from "$lib/components/ui/button/index.js";
   import { formatDate, formatDuration } from "$lib/stores/datetime";
   import { t } from "$lib/stores/i18n";
-  import type { NotificationEvent } from "$lib/server/controllers/dashboardController.js";
+  import type { NotificationEvent } from "$lib/types/notifications.js";
   import Calendar from "@lucide/svelte/icons/calendar-1";
   import { format } from "date-fns";
   import { onMount } from "svelte";
@@ -78,7 +78,14 @@
 
 <div class="flex items-center justify-between border-b px-4 py-3">
   <h4 class="text-sm font-semibold">{$t("Events")}</h4>
-  <Button variant="outline" href={clientResolver(resolve, resolvedEventsPath)} size="icon-sm" class="rounded-btn">
+  <Button
+    variant="outline"
+    href={clientResolver(resolve, resolvedEventsPath)}
+    size="icon-sm"
+    class="rounded-btn"
+    aria-label={$t("Open events page")}
+    title={$t("Open events page")}
+  >
     <Calendar class="size-4" />
   </Button>
 </div>
diff --git a/src/lib/components/NotificationsPopover.svelte b/src/lib/components/NotificationsPopover.svelte
index 69eb43f1..c97725e1 100644
--- a/src/lib/components/NotificationsPopover.svelte
+++ b/src/lib/components/NotificationsPopover.svelte
@@ -6,7 +6,7 @@
   import { requestNotifications } from "$lib/client/notifications-client.js";
   import ICONS from "$lib/icons";
   import { t } from "$lib/stores/i18n";
-  import type { NotificationEvent } from "$lib/server/controllers/dashboardController.js";
+  import type { NotificationEvent } from "$lib/types/notifications.js";
   import { onMount } from "svelte";
 
   interface Props {
diff --git a/src/lib/locales/en.json b/src/lib/locales/en.json
index 9bc3c930..ad44c3a4 100644
--- a/src/lib/locales/en.json
+++ b/src/lib/locales/en.json
@@ -87,6 +87,7 @@
     "Notifications": "Notifications",
     "One-time": "One-time",
     "Ongoing": "Ongoing",
+    "Open events page": "Open events page",
     "Operational": "Operational",
     "Partial Degraded Performance": "Partial Degraded Performance",
     "Partial System Outage": "Partial System Outage",
diff --git a/src/lib/server/controllers/dashboardController.ts b/src/lib/server/controllers/dashboardController.ts
index f65c50cc..eb5e3edd 100644
--- a/src/lib/server/controllers/dashboardController.ts
+++ b/src/lib/server/controllers/dashboardController.ts
@@ -17,6 +17,9 @@ import type {
 import type { GroupMonitorTypeData } from "../types/monitor.js";
 import GC from "../../global-constants.js";
 import type { LayoutServerData } from "./layoutController.js";
+import type { NotificationEvent } from "../../types/notifications.js";
+
+export type { NotificationEvent };
 
 // Default page settings
 const defaultPageSettings: PageSettingsType = {
@@ -27,16 +30,6 @@ const defaultPageSettings: PageSettingsType = {
   monitor_layout_style: GC.DEFAULT_MONITOR_LAYOUT_STYLE,
 };
 
-export interface NotificationEvent {
-  eventURL: string;
-  eventTitle: string;
-  eventDate: string;
-  eventType: string;
-  eventStartDateTime: number;
-  eventEndDateTime: number | null;
-  eventStatus: string;
-}
-
 export interface NotificationPayload {
   notifications: NotificationEvent[];
 }
diff --git a/src/lib/server/controllers/layoutController.ts b/src/lib/server/controllers/layoutController.ts
index a663a9b3..83a65d8d 100644
--- a/src/lib/server/controllers/layoutController.ts
+++ b/src/lib/server/controllers/layoutController.ts
@@ -80,7 +80,8 @@ function NormalizeEventDisplaySettings(settings?: Partial<EventDisplaySettings>)
   const defaults = structuredClone(seedSiteData.eventDisplaySettings);
 
   return {
-    showInlineEvents: Boolean(settings?.showInlineEvents ?? defaults.showInlineEvents),
+    showInlineEvents:
+      typeof settings?.showInlineEvents === "boolean" ? settings.showInlineEvents : defaults.showInlineEvents,
     incidents: {
       ...defaults.incidents,
       ...settings?.incidents,
diff --git a/src/lib/types/notifications.ts b/src/lib/types/notifications.ts
new file mode 100644
index 00000000..b13e8c21
--- /dev/null
+++ b/src/lib/types/notifications.ts
@@ -0,0 +1,9 @@
+export interface NotificationEvent {
+  eventURL: string;
+  eventTitle: string;
+  eventDate: string;
+  eventType: string;
+  eventStartDateTime: number;
+  eventEndDateTime: number | null;
+  eventStatus: string;
+}
diff --git a/src/routes/(kener)/+page.svelte b/src/routes/(kener)/+page.svelte
index 59bdf030..41fce3a5 100644
--- a/src/routes/(kener)/+page.svelte
+++ b/src/routes/(kener)/+page.svelte
@@ -172,7 +172,7 @@
     </Item.Root>
   </div>
   <div class="grid grid-cols-1 gap-4 sm:grid-cols-16">
-    <div class="col-span-1 flex flex-col gap-3 sm:gap-4 {!!!showInlineEvents ? 'sm:col-span-16' : 'sm:col-span-11'}">
+    <div class="col-span-1 flex flex-col gap-3 sm:gap-4 {!showInlineEvents ? 'sm:col-span-16' : 'sm:col-span-11'}">
       {#if !!data.monitorTags.length}
         <EventsCard statusClass={data.pageStatus.statusClass} statusText={data.pageStatus.statusSummary} />
         {#if showInlineEvents && data.ongoingIncidents && data.ongoingIncidents.length > 0}
diff --git a/src/routes/(kener)/[page_path]/+page.svelte b/src/routes/(kener)/[page_path]/+page.svelte
index bc7f750a..95f60cf7 100644
--- a/src/routes/(kener)/[page_path]/+page.svelte
+++ b/src/routes/(kener)/[page_path]/+page.svelte
@@ -144,7 +144,7 @@
 
 <!-- page title -->
 <div class="flex flex-col gap-3 sm:gap-4">
-  <ThemePlus monitor_tags={data.monitorTags} />
+  <ThemePlus monitor_tags={data.monitorTags} hideNotificationsPopover={showInlineEvents} />
   <div class="flex flex-col gap-2 px-3 py-2 sm:px-4">
     {#if data.pageDetails?.page_logo}
       <img
diff --git a/src/routes/(kener)/monitors/[monitor_tag]/+page.svelte b/src/routes/(kener)/monitors/[monitor_tag]/+page.svelte
index c7954787..47ec4e33 100644
--- a/src/routes/(kener)/monitors/[monitor_tag]/+page.svelte
+++ b/src/routes/(kener)/monitors/[monitor_tag]/+page.svelte
@@ -43,7 +43,11 @@
   {/if}
 </svelte:head>
 <div class="flex flex-col gap-3">
-  <ThemePlus monitor_tags={[data.monitorTag]} embedMonitorTag={data.monitorTag} />
+  <ThemePlus
+    monitor_tags={[data.monitorTag]}
+    embedMonitorTag={data.monitorTag}
+    hideNotificationsPopover={showInlineEvents}
+  />
   <div class="flex flex-col gap-2 px-4 py-2">
     {#if data.monitorImage}
       <img
diff --git a/src/routes/(manage)/manage/app/site-configurations/+page.svelte b/src/routes/(manage)/manage/app/site-configurations/+page.svelte
index d1e51191..46f94f4f 100644
--- a/src/routes/(manage)/manage/app/site-configurations/+page.svelte
+++ b/src/routes/(manage)/manage/app/site-configurations/+page.svelte
@@ -510,7 +510,8 @@
     const defaults = structuredClone(defaultEventDisplaySettings);
 
     return {
-      showInlineEvents: Boolean(parsed?.showInlineEvents ?? defaults.showInlineEvents),
+      showInlineEvents:
+        typeof parsed?.showInlineEvents === "boolean" ? parsed.showInlineEvents : defaults.showInlineEvents,
       incidents: {
         ...defaults.incidents,
         ...parsed?.incidents,