diff --git a/public/js/app.js b/public/js/app.js
index 3f6900a..2643d1f 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -72,6 +72,21 @@ const APP = {
 				channel_id
 			});
 		}
+
+		if (!document.body.dataset.channel || document.body.dataset.channel !== channel_id) {
+			const previous = typeof document.body.dataset.channel === 'string' ? document.body.dataset.channel : undefined;
+			if ( channel_id ) {
+				document.body.dataset.channel = channel_id;
+			}
+			else {
+				delete document.body.dataset.channel;
+			}
+
+			this._emit( 'channel_changed', {
+				previous,
+				channel_id
+			});
+		}
 	},
 
 	load: async function() {
@@ -234,3 +249,8 @@ const APP = {
 };
 
 document.addEventListener("DOMContentLoaded", APP.load.bind( APP ));
+APP.on( 'view_changed', ( { view } ) => {
+	if ( !view ) {
+		window.location.hash = '/chat';
+	}
+});
diff --git a/public/sidebar/sidebar.html b/public/sidebar/sidebar.html
index 83e7560..4fcea1b 100644
--- a/public/sidebar/sidebar.html
+++ b/public/sidebar/sidebar.html
@@ -87,6 +87,11 @@
 		border-right: 1px solid var(--border-subtle);
 	}
 
+	#sidebar .profile-container {
+		width: 100%;
+		max-width: 100%;
+	}
+
 	#sidebar #sidebar-context-menu {
 		display: none;
 		visibility: hidden;
diff --git a/public/tabs/chat/channel_sidebar.html b/public/tabs/chat/channel_sidebar.html
index 4e28bb9..8ac59fa 100644
--- a/public/tabs/chat/channel_sidebar.html
+++ b/public/tabs/chat/channel_sidebar.html
@@ -1,7 +1,10 @@
 <script>
-	APP.on("channels_updated", ({ channels }) => {
+	function on_channels_updated({ channels }) {
 		const channel_list = document.getElementById("channel-list");
 		if ( !channel_list ) {
+			setTimeout( () => {
+				on_channels_updated( { channels } );
+			}, 100 );
 			return;
 		}
 
@@ -16,38 +19,34 @@
 
 			channel_list.insertAdjacentHTML(
 				"beforeend",
-				`<li id="channel-selector-${channel.id}" class="channel" data-channel-selector-for="${channel.id}"><a href="#/channel/${channel.id}/chat">${channel.name}</a></li>`,
+				`<li id="channel-selector-${channel.id}" class="channel" data-channel-selector-for="${channel.id}"><a href="#/chat/channel/${channel.id}">${channel.name}</a></li>`,
 			);
 		}
-	});
+	}
 
-	APP.on( 'view_changed', ( { previous, view, channel_id } ) => {
+	APP.on("channels_updated", on_channels_updated );
 
-		if (document.body.dataset.channel !== channel_id) {
-			const previous_channel = typeof document.body.dataset.channel === 'string' ? document.body.dataset.channel : undefined;
+	APP.on( 'view_changed', async ( { previous, view, channel_id } ) => {
+		if ( view !== 'chat' ) {
+			return;
+		}
 
-			if ( channel_id ) {
-				document.body.dataset.channel = channel_id;
-			}
-			else {
-				delete document.body.dataset.channel;
-			}
+		const previous_channel = typeof document.body.dataset.channel === 'string' ? document.body.dataset.channel : undefined;
 
-			const target_channel_id = channel_id ?? this.CHANNELS.CHANNEL_LIST[0]?.id;
+		if ( channel_id ) {
+			document.body.dataset.channel = channel_id;
+		}
+		else {
+			delete document.body.dataset.channel;
+		}
 
-			// TODO: allow a different default than chat
-			const hash_target = `/${ view ? view : 'chat' }` + ( target_channel_id ? `/channel/${ target_channel_id }` : '' );
+		await APP.CHANNELS.update(); // don't force, but ensure we have channels
+		const target_channel_id = channel_id ?? APP.CHANNELS.CHANNEL_LIST[0]?.id;
 
-			if ( window.location.hash?.slice( 1 ) !== hash_target ) {
-				if ( previous_channel !== target_channel_id ) {
-					this._emit( 'channel_changed', {
-						previous: previous_channel,
-						channel_id: target_channel_id
-					});
-				}
+		const hash_target = `/chat` + ( target_channel_id ? `/channel/${ target_channel_id }` : '' );
 
-				window.location.hash = hash_target;
-			}
+		if ( window.location.hash?.slice( 1 ) !== hash_target ) {
+			window.location.hash = hash_target;
 		}
 	});