diff --git a/plugins/workbench-resources/src/components/ActivityStatus.svelte b/plugins/workbench-resources/src/components/ActivityStatus.svelte
index 447460d967..681532192d 100644
--- a/plugins/workbench-resources/src/components/ActivityStatus.svelte
+++ b/plugins/workbench-resources/src/components/ActivityStatus.svelte
@@ -18,7 +18,7 @@
   export let status: string = 'away'
 </script>
 
-<div class="flex-center {status}" style="min-height: 2rem;">
+<div class="flex-center {status}" style="min-height: 2rem;" on:click|stopPropagation={() => { }}>
   <div class="status"/>
 </div>
 
diff --git a/plugins/workbench-resources/src/components/AppItem.svelte b/plugins/workbench-resources/src/components/AppItem.svelte
index eac8120340..6c82cea96a 100644
--- a/plugins/workbench-resources/src/components/AppItem.svelte
+++ b/plugins/workbench-resources/src/components/AppItem.svelte
@@ -26,7 +26,7 @@
 </script>
 
 <Tooltip {label}>
-  <button class="app" class:selected={selected} on:click={action}>
+  <button class="app" class:selected={selected} on:click|stopPropagation={action}>
     <div class="icon-container" class:noty={notify}>
       <Icon icon={icon} size={'large'}/>
     </div>
diff --git a/plugins/workbench-resources/src/components/Workbench.svelte b/plugins/workbench-resources/src/components/Workbench.svelte
index eb47b3dc23..dd0e73ae0e 100644
--- a/plugins/workbench-resources/src/components/Workbench.svelte
+++ b/plugins/workbench-resources/src/components/Workbench.svelte
@@ -95,6 +95,10 @@
   $: query.query(workbench.class.Application, { hidden: false }, result => { apps = result })
 
   let visibileNav: boolean = true
+  const toggleNav = async () => {
+    visibileNav = !visibileNav
+    closeTooltip()
+  }
 </script>
 
 {#if client}
@@ -107,21 +111,19 @@
     </clipPath>
   </svg>
   <div class="container">
-    <div class="panel-app">
+    <div class="panel-app" on:click={toggleNav}>
       <div class="flex-col">
         <ActivityStatus status="active"/>
         <AppItem
           icon={TopMenu}
           label={visibileNav ? workbench.string.HideMenu : workbench.string.ShowMenu}
-          action={async () => {
-            visibileNav = !visibileNav
-            closeTooltip()
-          }}
+          selected={!visibileNav}
+          action={toggleNav}
         />
       </div>
       <Applications {apps} active={currentApp}/>
       <div class="flex-center" style="min-height: 6.25rem;">
-        <div class="cursor-pointer" on:click={(el) => { showPopup(AccountPopup, { }, 'account') }}>
+        <div class="cursor-pointer" on:click|stopPropagation={(el) => { showPopup(AccountPopup, { }, 'account') }}>
           <Avatar size={'medium'} />
         </div>
       </div>