diff --git a/src/components/repo.tsx b/src/components/repo.tsx
index 6112371..585e14f 100644
--- a/src/components/repo.tsx
+++ b/src/components/repo.tsx
@@ -17,12 +17,14 @@ import {
 	GitPullRequest,
 	LoaderCircle,
 	MessageSquarePlus,
+	Reply,
+	X,
 } from 'lucide-solid';
 import { useAuth } from '../lib/auth';
 import { resolveActor } from '../lib/api/identity';
 import { marked } from 'marked';
-import { A, useNavigate } from '@solidjs/router';
-import { For, Show, createMemo, createSignal, onCleanup, onMount, type Component, type JSX } from 'solid-js';
+import { A, useNavigate, useLocation } from '@solidjs/router';
+import { For, Show, createMemo, createSignal, createEffect, onCleanup, onMount, type Component, type JSX } from 'solid-js';
 import type { RepoContext, TreeEntry } from '../lib/api/repos';
 import type { Did } from '@atcute/lexicons/syntax';
 import { createQuery } from '@tanstack/solid-query';
@@ -30,9 +32,9 @@ import { getRepo, getRepoLanguages, getRepoForkCount, getRepoByDid } from '../li
 import { getRepoStarCount } from '../lib/api/stars';
 import { getRepoIssueCount } from '../lib/api/issues';
 import { getRepoPullCount } from '../lib/api/pulls';
-import { formatRelativeTime, languageColor, encodePath, formatLanguagePercent, blobHref, treeHref } from '../lib/repo-utils';
+import { formatRelativeTime, languageColor, encodePath, formatLanguagePercent, blobHref, treeHref, getErrorMessage } from '../lib/repo-utils';
 import { getTangledAppviewService } from '../lib/settings';
-import { Avatar, SkeletonBlock, StateBadge, PlaceholderAvatar, buttonStyles, cardStyles } from './common';
+import { Avatar, SkeletonBlock, StateBadge, PlaceholderAvatar, buttonStyles, cardStyles, textareaStyles } from './common';
 import { useRepoPreloader } from '../lib/preloading';
 
 
@@ -1625,6 +1627,7 @@ export { CodeView, DiffView, PullDiffView } from './code-view';
 
 export interface GenericComment {
 	uri: string;
+	cid?: string;
 	rkey: string;
 	author: { did: string; handle: string };
 	value: {
@@ -1643,9 +1646,58 @@ export const CommentThreadsSection: Component<{
 	threads: GenericCommentThread[];
 	authorDid?: string;
 	title?: string;
+	onReplySubmit?: (body: string, parentComment: GenericComment) => Promise<void>;
 }> = (props) => {
+	const auth = useAuth();
+	const location = useLocation();
+	const [replyingTo, setReplyingTo] = createSignal<GenericComment | null>(null);
+	const [replyBody, setReplyBody] = createSignal('');
+	const [replyWorking, setReplyWorking] = createSignal(false);
+	const [replyError, setReplyError] = createSignal<string | null>(null);
+
+	createEffect(() => {
+		const hash = location.hash;
+		const cleanHash = hash.startsWith('#') ? hash.slice(1) : hash;
+		if (cleanHash && cleanHash.startsWith('comment-') && props.threads.length > 0) {
+			setTimeout(() => {
+				const element = document.getElementById(cleanHash);
+				if (element) {
+					// Remove highlight from any other elements first
+					document.querySelectorAll('.untangled-comment-highlight').forEach((el) => {
+						el.classList.remove('untangled-comment-highlight');
+					});
+					element.scrollIntoView({ behavior: 'smooth', block: 'center' });
+					element.classList.add('untangled-comment-highlight');
+				}
+			}, 150);
+		}
+	});
+
+	const viewerQuery = createQuery(() => ({
+		queryKey: ['viewer', auth.currentDid()],
+		enabled: Boolean(auth.currentDid()),
+		queryFn: async () => resolveActor(auth.currentDid()!),
+	}));
+
+	const handleReplySubmit = async (e: SubmitEvent, parent: GenericComment) => {
+		e.preventDefault();
+		if (!props.onReplySubmit || !replyBody().trim() || replyWorking()) return;
+
+		setReplyWorking(true);
+		setReplyError(null);
+		try {
+			await props.onReplySubmit(replyBody(), parent);
+			setReplyBody('');
+			setReplyingTo(null);
+		} catch (err) {
+			setReplyError(getErrorMessage(err));
+		} finally {
+			setReplyWorking(false);
+		}
+	};
+
 	return (
-		<div class="mt-6 space-y-4">
+		<div class={clsx(props.title && 'mt-6', 'space-y-4')}>
 			<Show when={props.title}>
 				<h3 class="text-lg font-bold border-b border-gray-200 dark:border-gray-700 pb-2 dark:text-white mb-4">
 					{props.title}
@@ -1654,34 +1706,98 @@ export const CommentThreadsSection: Component<{
 			<div class="space-y-4">
 				<For each={props.threads}>
 					{(thread) => (
-						<div class="rounded border border-gray-200 dark:border-gray-700 w-full overflow-hidden shadow-sm bg-gray-50 dark:bg-gray-800/50">
+						<div class="untangled-thread-group">
 							<ThreadCommentView
 								id={`comment-${thread.item.rkey}`}
 								author={thread.item.author}
 								createdAt={thread.item.value.createdAt}
 								markdown={thread.item.value.body}
 								isAuthor={props.authorDid ? thread.item.author.did === props.authorDid : false}
-								class="rounded px-6 py-4 bg-white dark:bg-gray-800"
+								class="untangled-thread-comment"
 							/>
 							<Show when={thread.replies.length > 0}>
-								<div class="relative ml-10 border-l-2 border-gray-200 dark:border-gray-700">
+								<div class="untangled-thread-replies-list">
 									<For each={thread.replies}>
 										{(reply) => (
-											<div class="-ml-4">
-												<ThreadCommentView
-													id={`comment-${reply.rkey}`}
-													author={reply.author}
-													createdAt={reply.value.createdAt}
-													markdown={reply.value.body}
-													isAuthor={props.authorDid ? reply.author.did === props.authorDid : false}
-													isReply={true}
-													class="py-4 pr-4"
-												/>
-											</div>
+											<ThreadCommentView
+												id={`comment-${reply.rkey}`}
+												author={reply.author}
+												createdAt={reply.value.createdAt}
+												markdown={reply.value.body}
+												isAuthor={props.authorDid ? reply.author.did === props.authorDid : false}
+												isReply={true}
+												class="untangled-thread-reply"
+											/>
 										)}
 									</For>
 								</div>
 							</Show>
+
+							<Show when={props.onReplySubmit && auth.agent()}>
+								<Show
+									when={replyingTo()?.uri === thread.item.uri}
+									fallback={
+										<button
+											type="button"
+											class="untangled-thread-reply-trigger"
+											onClick={() => {
+												setReplyingTo(thread.item);
+												setReplyBody('');
+												setReplyError(null);
+											}}
+										>
+											<Show when={auth.currentDid()}>
+												{(did) => <Avatar did={did()} size="size-8 mr-1" />}
+											</Show>
+											<span class="w-full p-0">Leave a reply...</span>
+										</button>
+									}
+								>
+									<form
+										onSubmit={(event) => void handleReplySubmit(event, thread.item)}
+										class="untangled-thread-reply-form"
+									>
+										<Show when={viewerQuery.data}>
+											{(viewer) => (
+												<div class="flex items-center gap-2 text-sm text-gray-500 dark:text-gray-400">
+													<Avatar did={viewer().did} size="size-6" />
+													<span>{viewer().handle || viewer().did}</span>
+												</div>
+											)}
+										</Show>
+										<textarea
+											value={replyBody()}
+											onInput={(event) => setReplyBody(event.currentTarget.value)}
+											class={textareaStyles()}
+											rows="3"
+											placeholder="Leave a reply..."
+										/>
+										<Show when={replyError()}>
+											<div class="text-sm text-red-500 mt-1">{replyError()}</div>
+										</Show>
+										<div class="flex flex-wrap items-stretch justify-end gap-2 text-sm text-gray-500 dark:text-gray-400">
+											<button
+												type="button"
+												class={clsx(buttonStyles(), 'text-red-500 dark:text-red-400')}
+												onClick={() => setReplyingTo(null)}
+											>
+												<X class="size-4" />
+												cancel
+											</button>
+											<button
+												type="submit"
+												class={buttonStyles('primary')}
+												disabled={replyWorking() || !replyBody().trim()}
+											>
+												<Show when={replyWorking()} fallback={<Reply class="size-4" />}>
+													<LoaderCircle class="size-4 animate-spin" />
+												</Show>
+												reply
+											</button>
+										</div>
+									</form>
+								</Show>
+							</Show>
 						</div>
 					)}
 				</For>
@@ -1707,7 +1823,7 @@ export const CommentComposer: Component<{
 	}));
 
 	return (
-		<form onSubmit={props.onSubmit} class="group/form w-full mt-4 flex flex-col">
+		<form onSubmit={props.onSubmit} class="group/form w-full flex flex-col">
 			<div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-4 px-4 relative w-full border border-gray-200 dark:border-gray-700">
 				<div class="text-sm pb-2 text-gray-500 dark:text-gray-400">
 					<Show when={viewerQuery.data} fallback={<div class="h-6" />}>
@@ -1722,7 +1838,7 @@ export const CommentComposer: Component<{
 				<textarea
 					rows={5}
 					placeholder={props.placeholder ?? 'Add to the discussion. Markdown is supported.'}
-					class="w-full p-2 rounded border border-gray-200 dark:border-gray-700 bg-transparent focus:outline-none focus:ring-1 focus:ring-blue-500 dark:focus:ring-blue-400 dark:text-white"
+					class={textareaStyles()}
 					required
 					value={props.value}
 					onInput={(event) => props.onValueChange(event.currentTarget.value)}
diff --git a/src/index.css b/src/index.css
index 9176758..e1e6318 100644
--- a/src/index.css
+++ b/src/index.css
@@ -2091,6 +2091,7 @@ details[open] > .untangled-language-bar {
 
 .untangled-thread-reply {
 	margin-left: -1rem;
+	width: calc(100% + 1rem) !important;
 	display: flex;
 	gap: 0.5rem;
 	padding: 1rem 1rem 1rem 0;
diff --git a/src/lib/api/strings.ts b/src/lib/api/strings.ts
index d556ffc..54dc649 100644
--- a/src/lib/api/strings.ts
+++ b/src/lib/api/strings.ts
@@ -125,6 +125,29 @@ export const getString = async (
 	return { owner, record };
 };
 
+export const getStringRecord = async (uri: ResourceUri): Promise<{ owner: ResolvedActor; record: StringRecord }> => {
+	const parsed = parseAtUri(uri);
+	const owner = await resolveActor(parsed.did);
+	const response = await ok(
+		getRpc(owner.pds).get('com.atproto.repo.getRecord', {
+			params: {
+				repo: owner.did,
+				collection: STRING_COLLECTION,
+				rkey: parsed.rkey,
+			},
+		}),
+	);
+
+	const record: StringRecord = {
+		uri: response.uri,
+		cid: response.cid ?? '',
+		rkey: parsed.rkey,
+		value: response.value as ShTangledString.Main,
+	};
+	return { owner, record };
+};
+
+
 export const deleteString = async (agent: OAuthUserAgent, rkey: string): Promise<void> => {
 	const rpc = createAuthRpc(agent);
 	await ok(
diff --git a/src/pages/search.tsx b/src/pages/search.tsx
index d7ed0db..c95ea71 100644
--- a/src/pages/search.tsx
+++ b/src/pages/search.tsx
@@ -23,9 +23,11 @@ import { RepoStatsList } from '../components/repo';
 import { getIssueRecord, getIssue } from '../lib/api/issues';
 import { getPullRecord, getPull } from '../lib/api/pulls';
 import { getRepoByDid } from '../lib/api/repos';
+import { getStringRecord } from '../lib/api/strings';
 import { issueQueryKey, pullQueryKey } from './repo/shared';
 import {
 	ISSUE_COLLECTION,
+	STRING_COLLECTION,
 } from '../lib/api/constants';
 import {
 	parseAtUri,
@@ -229,6 +231,12 @@ const CommentParentLink: Component<{ hit: SearchHit }> = (props) => {
 
 		try {
 			const parsed = parseAtUri(uri);
+			if (parsed.collection === STRING_COLLECTION) {
+				return {
+					uri,
+					kind: 'string' as const,
+				};
+			}
 			return {
 				uri,
 				kind: parsed.collection === ISSUE_COLLECTION ? 'issue' as const : 'pull' as const,
@@ -243,6 +251,9 @@ const CommentParentLink: Component<{ hit: SearchHit }> = (props) => {
 		enabled: Boolean(parentInfo()?.uri),
 		queryFn: async () => {
 			const info = parentInfo()!;
+			if (info.kind === 'string') {
+				return { kind: 'string' as const, data: await getStringRecord(info.uri) };
+			}
 			return info.kind === 'issue'
 				? { kind: 'issue' as const, record: await getIssueRecord(info.uri) }
 				: { kind: 'pull' as const, record: await getPullRecord(info.uri) };
@@ -252,16 +263,31 @@ const CommentParentLink: Component<{ hit: SearchHit }> = (props) => {
 
 	return (
 		<Show when={parentQuery.data} fallback={<span>comment</span>}>
-			{(parent) => {
-				const repoDid = createMemo(() => parent().kind === 'issue'
-					? (parent().record.value as { repo: Did }).repo
-					: (parent().record.value as { target: { repo: Did } }).target.repo);
-				return (
-					<RepoThreadLink kind={parent().kind} repoDid={repoDid()} threadRef={parent().record.rkey} commentRef={props.hit.rkey}>
-						comment on {parent().kind}
-					</RepoThreadLink>
-				);
-			}}
+			{(parent) => (
+				<Switch>
+					<Match when={parent().kind === 'string'}>
+						<A
+							href={`/strings/${(parent() as any).data.owner.handle || (parent() as any).data.owner.did}/${(parent() as any).data.record.rkey}#comment-${props.hit.rkey}`}
+							class="truncate min-w-0 font-medium"
+						>
+							comment on string
+						</A>
+					</Match>
+					<Match when={parent().kind !== 'string'}>
+						<RepoThreadLink
+							kind={(parent() as any).kind}
+							repoDid={(parent() as any).kind === 'issue'
+								? ((parent() as any).record.value as { repo: Did }).repo
+								: ((parent() as any).record.value as { target: { repo: Did } }).target.repo
+							}
+							threadRef={(parent() as any).record.rkey}
+							commentRef={props.hit.rkey}
+						>
+							comment on {(parent() as any).kind}
+						</RepoThreadLink>
+					</Match>
+				</Switch>
+			)}
 		</Show>
 	);
 };
@@ -301,6 +327,9 @@ const ResultRepoContext: Component<{ hit: SearchHit }> = (props) => {
 		queryFn: async () => {
 			const uri = parentUri()!;
 			const parsed = parseAtUri(uri);
+			if (parsed.collection === STRING_COLLECTION) {
+				return undefined;
+			}
 			if (parsed.collection === ISSUE_COLLECTION) {
 				const issue = await getIssueRecord(uri);
 				return (issue.value as { repo: Did }).repo;
diff --git a/src/pages/string.tsx b/src/pages/string.tsx
index 3df1be6..6af94a9 100644
--- a/src/pages/string.tsx
+++ b/src/pages/string.tsx
@@ -292,11 +292,23 @@ export const StringPage: Component = () => {
 							</section>
 
 							{/* Comments section */}
-							<div class="flex flex-col gap-4 mt-4">
+							<div class="flex flex-col gap-4">
 								<Show when={commentsQuery.data}>
 									<CommentThreadsSection
 										threads={commentThreads()}
 										authorDid={owner.did}
+										onReplySubmit={async (body, parent) => {
+											const agent = auth.agent();
+											if (!agent) return;
+											await createStringComment(
+												agent,
+												record.uri,
+												record.cid,
+												body,
+												{ uri: parent.uri as ResourceUri, cid: parent.cid ?? '' }
+											);
+											await queryClient.invalidateQueries({ queryKey: ['string-comments', record.uri] });
+										}}
 									/>
 								</Show>