diff --git a/src/components/molecules/Switcher.svelte b/src/components/molecules/Switcher.svelte
index 5d28de5..623a62b 100644
--- a/src/components/molecules/Switcher.svelte
+++ b/src/components/molecules/Switcher.svelte
@@ -1,14 +1,9 @@
 <script lang="ts">
-    import { createEventDispatcher } from 'svelte'
-    // Components
     import Icon from '$components/atoms/Icon.svelte'
 
     let switcherEl: HTMLElement
     let isOpen = false
 
-
-    const dispatch = createEventDispatcher()
-
     // Links
     const links = [
         {
@@ -44,9 +39,9 @@
      * Detect outside click
      */
     const windowClick = ({ target }) => {
-		if (!switcherEl.contains(target)) {
+		if (!switcherEl.contains(target) && isOpen) {
             // Close switcher
-			isOpen = false
+			toggleSwitcher()
 		}
 	}
 </script>