diff --git a/src/components/UIShell/UIShellNav/UtilityComponent.svelte b/src/components/UIShell/UIShellNav/UtilityComponent.svelte
index 4fa6e3e2..84ae042e 100644
--- a/src/components/UIShell/UIShellNav/UtilityComponent.svelte
+++ b/src/components/UIShell/UIShellNav/UtilityComponent.svelte
@@ -1,11 +1,21 @@
 <script>
   export let type = undefined;
   export let icon = undefined;
-  export let content = undefined;
   export let componentIsActive = undefined;
+
+  let elRigthPanel = undefined;
+
   import { cx } from '../../../lib';
   import Icon from '../../Icon/Icon.svelte';
   import { slide } from 'svelte/transition';
+
+  function mouseUp({ target }) {
+    if (target && elRigthPanel) {
+      if (!elRigthPanel.contains(target)) {
+        componentIsActive = false;
+      }
+    }
+  }
 </script>
 
 <style>
@@ -14,25 +24,26 @@
   }
 </style>
 
+<svelte:window on:mouseup={mouseUp} />
+
 <div id="right-panel-action-component">
   <button
     aria-label={type}
     class={cx('--header__action', componentIsActive && '--header__action--active')}
     type="button"
-    on:keydown={({ key }) => {
-      if (key === 'Enter') {
-        componentIsActive = !componentIsActive;
-      }
+    on:click={() => {
+      componentIsActive = true;
     }}>
     <Icon {...icon} />
   </button>
   {#if componentIsActive}
     <div
+      bind:this={elRigthPanel}
       id="right-panel-action-component-form"
       class={cx('--header-panel', '--header-panel--expanded')}
       transition:slide={{ duration: 200 }}>
       <div class="component-form">
-        <svelte:component this={content} />
+        <slot />
       </div>
     </div>
   {/if}