diff --git a/web/src/ui/roomlist/FakeSpace.tsx b/web/src/ui/roomlist/FakeSpace.tsx
index 59120e8..bb46319 100644
--- a/web/src/ui/roomlist/FakeSpace.tsx
+++ b/web/src/ui/roomlist/FakeSpace.tsx
@@ -27,7 +27,7 @@ export interface FakeSpaceProps {
 	space: Space | null
 	setSpace: (space: RoomListFilter | null) => void
 	isActive: boolean
-	onClickUnread?: (evt: React.MouseEvent<HTMLDivElement> | null, space: Space | null) => void
+	onClickUnread?: (evt: React.MouseEvent<HTMLDivElement>, space: Space | null) => void
 }
 
 const getFakeSpaceMeta = (space: RoomListFilter | null): [string | undefined, JSX.Element | null] => {
@@ -47,7 +47,9 @@ const getFakeSpaceMeta = (space: RoomListFilter | null): [string | undefined, JS
 
 const FakeSpace = ({ space, setSpace, isActive, onClickUnread }: FakeSpaceProps) => {
 	const unreads = useEventAsState(space?.counts)
-	const onClickUnreadWrapped = onClickUnread ? () => onClickUnread(null, space) : undefined
+	const onClickUnreadWrapped = onClickUnread
+		? (evt: React.MouseEvent<HTMLDivElement>) => onClickUnread(evt, space)
+		: undefined
 	const [title, icon] = getFakeSpaceMeta(space)
 	return <div className={`space-entry ${isActive ? "active" : ""}`} onClick={() => setSpace(space)} title={title}>
 		<UnreadCount counts={unreads} space={true} onClick={onClickUnreadWrapped} />
diff --git a/web/src/ui/roomlist/RoomList.tsx b/web/src/ui/roomlist/RoomList.tsx
index b4c0b78..39d4cb5 100644
--- a/web/src/ui/roomlist/RoomList.tsx
+++ b/web/src/ui/roomlist/RoomList.tsx
@@ -51,17 +51,17 @@ const RoomList = ({ activeRoomID, space }: RoomListProps) => {
 		mainScreen.setSpace(store)
 	}, [mainScreen, client])
 	const onClickSpaceUnread = useCallback((
-		evt: React.MouseEvent<HTMLDivElement> | null, space?: SpaceStore | null,
+		evt: React.MouseEvent<HTMLDivElement>, space?: SpaceStore | null,
 	) => {
-		if (evt) {
+		if (!space) {
 			const targetSpace = evt.currentTarget.closest("div.space-entry")?.getAttribute("data-target-space")
 			if (!targetSpace) {
 				return
 			}
 			space = client.store.getSpaceStore(targetSpace)
-		}
-		if (!space) {
-			return
+			if (!space) {
+				return
+			}
 		}
 		const counts = space.counts.current
 		let wantedField: keyof SpaceUnreadCounts
@@ -78,6 +78,8 @@ const RoomList = ({ activeRoomID, space }: RoomListProps) => {
 			const entry = client.store.roomList.current[i]
 			if (entry[wantedField] > 0 && space.include(entry)) {
 				mainScreen.setActiveRoom(entry.room_id)
+				mainScreen.setSpace(space)
+				evt.stopPropagation()
 				break
 			}
 		}