diff --git a/client/components/Sidebar.vue b/client/components/Sidebar.vue
index 0f3a2170..e7445bcb 100644
--- a/client/components/Sidebar.vue
+++ b/client/components/Sidebar.vue
@@ -25,7 +25,8 @@
 					aria-label="Sign in"
 				><button
 					class="icon sign-in"
-					data-target="SignIn"
+					data-target="#sign-in"
+					data-component="SignIn"
 					aria-label="Sign in"
 					role="tab"
 					aria-controls="sign-in"
@@ -36,7 +37,8 @@
 					aria-label="Connect to network"
 				><button
 					class="icon connect"
-					data-target="Connect"
+					data-target="#connect"
+					data-component="Connect"
 					aria-label="Connect to network"
 					role="tab"
 					aria-controls="connect"
@@ -47,7 +49,8 @@
 					aria-label="Settings"
 				><button
 					class="icon settings"
-					data-target="Settings"
+					data-target="#settings"
+					data-component="Settings"
 					aria-label="Settings"
 					role="tab"
 					aria-controls="settings"
@@ -58,7 +61,8 @@
 					aria-label="Help"
 				><button
 					class="icon help"
-					data-target="Help"
+					data-target="#help"
+					data-component="Help"
 					aria-label="Help"
 					role="tab"
 					aria-controls="help"
diff --git a/client/js/lounge.js b/client/js/lounge.js
index 5a1062c0..5304ac53 100644
--- a/client/js/lounge.js
+++ b/client/js/lounge.js
@@ -107,7 +107,8 @@ window.vueMounted = () => {
 			}
 		} else {
 			vueApp.activeChannel = null;
-			vueApp.$store.commit("activeWindow", target);
+			const component = self.attr("data-component");
+			vueApp.$store.commit("activeWindow", component);
 
 			if (!keepSidebarOpen && $(window).outerWidth() <= utils.mobileViewportPixels) {
 				vueApp.setSidebar(false);