diff --git a/src/UIShell/GlobalHeader/HeaderAction.svelte b/src/UIShell/GlobalHeader/HeaderAction.svelte
index 6d6f5d1e..6480f2d1 100644
--- a/src/UIShell/GlobalHeader/HeaderAction.svelte
+++ b/src/UIShell/GlobalHeader/HeaderAction.svelte
@@ -18,9 +18,18 @@
    */
   export let text = undefined;
 
+  /**
+   * Obtain a reference to the button HTML element
+   * @type {null | HTMLButtonElement} [ref=null]
+   */
+  export let ref = null;
+
   import { Icon } from "../../Icon";
+  import { createEventDispatcher } from "svelte";
   import { slide } from "svelte/transition";
 
+  const dispatch = createEventDispatcher();
+
   let refPanel = null;
 </script>
 
@@ -40,17 +49,17 @@
   }
 </style>
 
-<svelte:window
-  on:mouseup={({ target }) => {
-    if (target && refPanel) {
-      if (!refPanel.contains(target)) {
-        isOpen = false;
-      }
+<svelte:body
+  on:click={({ target }) => {
+    if (isOpen && !ref.contains(target) && !refPanel.contains(target)) {
+      isOpen = false;
+      dispatch('close');
     }
   }} />
 
 <div>
   <button
+    bind:this={ref}
     type="button"
     class:bx--header__action={true}
     class:bx--header__action--active={isOpen}
@@ -58,7 +67,8 @@
     {...$$restProps}
     on:click
     on:click={() => {
-      isOpen = true;
+      isOpen = !isOpen;
+      dispatch(isOpen ? 'open' : 'close');
     }}>
     <Icon {...icon} />
     <slot name="text">
diff --git a/src/UIShell/UIShell.Story.svelte b/src/UIShell/UIShell.Story.svelte
index 504fabe3..46fd17c4 100644
--- a/src/UIShell/UIShell.Story.svelte
+++ b/src/UIShell/UIShell.Story.svelte
@@ -37,7 +37,7 @@
     title: "Catalog",
     tabindex: "0",
     focusable: false,
-    style: undefined
+    style: undefined,
   };
 
   let iHelp = {
@@ -47,7 +47,7 @@
     title: "Help",
     tabindex: "0",
     focusable: false,
-    style: undefined
+    style: undefined,
   };
 
   let iAdjust = {
@@ -57,7 +57,7 @@
     title: "Catalog",
     tabindex: "0",
     focusable: false,
-    style: undefined
+    style: undefined,
   };
 
   let iProtection = {
@@ -67,7 +67,7 @@
     title: "Catalog",
     tabindex: "0",
     focusable: false,
-    style: undefined
+    style: undefined,
   };
 
   let iSwitcher = {
@@ -77,7 +77,7 @@
     title: "App Switcher",
     tabindex: "0",
     focusable: false,
-    style: undefined
+    style: undefined,
   };
 
   let iAccount = {
@@ -87,7 +87,7 @@
     title: "Account",
     tabindex: "0",
     focusable: false,
-    style: undefined
+    style: undefined,
   };
 
   let iNotifications = {
@@ -97,7 +97,7 @@
     title: "Notifications",
     tabindex: "0",
     focusable: false,
-    style: undefined
+    style: undefined,
   };
 
   let iSettings = {
@@ -107,7 +107,7 @@
     title: "Settings",
     tabindex: "0",
     focusable: false,
-    style: undefined
+    style: undefined,
   };
 </script>
 
@@ -167,7 +167,16 @@
 {:else if story === 'header-with-switcher'}
   <Header {...$$props}>
     <HeaderUtilities>
-      <HeaderAction type="Switcher" icon={iSwitcher} isOpen={true}>
+      <HeaderAction
+        type="Switcher"
+        icon={iSwitcher}
+        isOpen
+        on:open={() => {
+          console.log('on:open');
+        }}
+        on:close={() => {
+          console.log('on:close');
+        }}>
         <HeaderPanelLinks>
           <HeaderPanelDivider>Switcher subject 1</HeaderPanelDivider>
           <HeaderPanelLink>Switcher item 1</HeaderPanelLink>