diff --git a/codetab.ts b/codetab.ts
index c7d3b23..2dd3b6d 100644
--- a/codetab.ts
+++ b/codetab.ts
@@ -520,10 +520,12 @@ const update = async () => {
 			state.doubleClickTimer = 10;
 		}
 		const {x, y} = mousePos();
-		state.setSelection(pixelToIndex(state.code, x, y-8));
+		state.setSelection(pixelToIndex(state.code, x+state.scrollX, y+state.scrollY-8));
+		state.scrollToCursor();
 	} else if (mouseHeld()) {
 		const {x, y} = mousePos();
-		state.setFocus(pixelToIndex(state.code, x, y-8));
+		state.setFocus(pixelToIndex(state.code, x+state.scrollX, y+state.scrollY-8));
+		state.scrollToCursor();
 	} else {
 		state.wordMode = false;
 	}