diff --git a/goofy-client/libs/navigation/src/lib/header-container/header/settings/settings.component.html b/goofy-client/libs/navigation/src/lib/header-container/header/settings/settings.component.html
index b4e29e915905deff88f37c5c299fef4b93570d94..1524dc46ed1cf454c3864f7326017472a900ff23 100644
--- a/goofy-client/libs/navigation/src/lib/header-container/header/settings/settings.component.html
+++ b/goofy-client/libs/navigation/src/lib/header-container/header/settings/settings.component.html
@@ -1,9 +1,14 @@
-<goofy-client-icon-button-with-spinner icon="settings" [matMenuTriggerFor]="settingsMenu"></goofy-client-icon-button-with-spinner>
+<goofy-client-icon-button-with-spinner
+		icon="settings"
+		[matMenuTriggerFor]="settingsMenu"
+		(menuOpened)="toggle.focus()">
+</goofy-client-icon-button-with-spinner>
+
 <mat-menu #settingsMenu="matMenu" >
 	<div class="menu-container"
 		(click)="$event.stopPropagation()">
 
-		<mat-slide-toggle color="primary"
+		<mat-slide-toggle color="primary" #toggle
 			[checked]="darkMode"
 			(change)="darkModeEmitter.emit($event.checked)">Dark Mode
 		</mat-slide-toggle>
diff --git a/goofy-client/libs/navigation/src/lib/header-container/header/settings/settings.component.scss b/goofy-client/libs/navigation/src/lib/header-container/header/settings/settings.component.scss
index abfd1903616f9e17d3c8b1f5fb5f5cfef047fad0..982d28ee457184d07da4cb2d8271bc6fd7a8f576 100644
--- a/goofy-client/libs/navigation/src/lib/header-container/header/settings/settings.component.scss
+++ b/goofy-client/libs/navigation/src/lib/header-container/header/settings/settings.component.scss
@@ -1,3 +1,7 @@
 .menu-container {
 	margin: 12px 16px;
 }
+
+goofy-client-icon-button-with-spinner {
+	display: block;
+}