diff --git a/src/webpage/channel.ts b/src/webpage/channel.ts
index fe58191..59ef808 100644
--- a/src/webpage/channel.ts
+++ b/src/webpage/channel.ts
@@ -1260,7 +1260,7 @@ class Channel extends SnowFlake {
 		}
 		await Promise.all(waits);
 	}
-	async focus(id: string) {
+	async focus(id: string, flash = true) {
 		const prom = this.getMessages(id);
 
 		if (await Promise.race([prom, new Promise((res) => setTimeout(() => res(true), 300))])) {
@@ -1278,7 +1278,7 @@ class Channel extends SnowFlake {
 		try {
 			await this.infinite.focus(id);
 		} catch {}
-		this.infinite.focus(id, true, true);
+		this.infinite.focus(id, flash, true);
 	}
 	editLast() {
 		let message: Message | undefined = this.lastmessage;
@@ -2849,8 +2849,7 @@ class Channel extends SnowFlake {
 		}
 	}
 	async goToBottom() {
-		if (this.localuser.channelfocus !== this) await this.tryfocusinfinate();
-		if (this.lastmessageid) this.infinite.focus(this.lastmessageid, false, true);
+		if (this.lastmessageid) this.focus(this.lastmessageid, false);
 	}
 	async messageCreate(messagep: messageCreateJson): Promise<void> {
 		if (!this.hasPermission("VIEW_CHANNEL")) {
@@ -2887,6 +2886,15 @@ class Channel extends SnowFlake {
 		}
 		this.setLastMessageId(messagez.id);
 
+		this.unreads();
+		this.guild.unreads();
+		if (this === this.localuser.channelfocus) {
+			if (!this.infinitefocus) {
+				await this.tryfocusinfinate();
+			}
+			await this.infinite.addedBottom();
+		}
+
 		if (messagez.author === this.localuser.user) {
 			const next = this.messages.get(this.idToNext.get(this.lastreadmessageid as string) as string);
 			this.lastSentMessage = messagez;
@@ -2902,14 +2910,7 @@ class Channel extends SnowFlake {
 				await this.goToBottom();
 			}
 		}
-		this.unreads();
-		this.guild.unreads();
-		if (this === this.localuser.channelfocus) {
-			if (!this.infinitefocus) {
-				await this.tryfocusinfinate();
-			}
-			await this.infinite.addedBottom();
-		}
+
 		if (messagez.author === this.localuser.user) {
 			return;
 		}
diff --git a/src/webpage/infiniteScroller.ts b/src/webpage/infiniteScroller.ts
index 3cd8994..230784c 100644
--- a/src/webpage/infiniteScroller.ts
+++ b/src/webpage/infiniteScroller.ts
@@ -186,8 +186,8 @@ class InfiniteScroller {
 	}
 
 	async deleteId(id: string) {
-		const prev = this.backElm.get(id) || this.backElm.has(id) ? null : undefined;
-		const next = this.forElm.get(id) || this.forElm.has(id) ? null : undefined;
+		const prev = this.backElm.get(id) || (this.backElm.has(id) ? null : undefined);
+		const next = this.forElm.get(id) || (this.forElm.has(id) ? null : undefined);
 		await this.removeElm(id);
 		if (prev && next !== null) this.forElm.set(prev, next);
 		if (next && prev !== null) this.backElm.set(next, prev);
@@ -324,7 +324,7 @@ class InfiniteScroller {
 				break;
 			}
 			if (this.backElm.has(bottom) && this.curElms.has(bottom)) {
-				if (limit === 75) throw new Error("patchy?");
+				if (limit === 75) console.error("patchy?");
 				bottom = this.backElm.get(bottom);
 			} else if (count > limit) {
 				break;