diff --git a/web/src/templates/api.ts b/web/src/templates/api.ts
index 268c8db..751f2c7 100644
--- a/web/src/templates/api.ts
+++ b/web/src/templates/api.ts
@@ -167,6 +167,7 @@ function useBaseTemplates() {
 		"/base-templates",
 		(): Promise<BaseTemplate[]> =>
 			fetchApi("/base-templates").then((res) => res.json()),
+		{ refreshInterval: Number.POSITIVE_INFINITY },
 	);
 }
 
diff --git a/web/src/templates/template-editor.tsx b/web/src/templates/template-editor.tsx
index 4248cfa..0b430c9 100644
--- a/web/src/templates/template-editor.tsx
+++ b/web/src/templates/template-editor.tsx
@@ -225,7 +225,7 @@ function EditorTopBar() {
 		<Dialog>
 			<header className="sticky top-0 flex shrink-0 items-center justify-between gap-2 border-b bg-background p-4">
 				<p className="font-bold">{currentFilePath}</p>
-				<DialogTrigger>
+				<DialogTrigger asChild>
 					<Button>
 						{isBuildInProgress ? (
 							<Loader2 className="animate-spin" />
diff --git a/web/src/workspaces/workspace-table.tsx b/web/src/workspaces/workspace-table.tsx
index 55b6a3b..2daf640 100644
--- a/web/src/workspaces/workspace-table.tsx
+++ b/web/src/workspaces/workspace-table.tsx
@@ -268,7 +268,7 @@ function DeleteWorkspaceButton({ workspace }: { workspace: Workspace }) {
 function WorkspaceInfoButton() {
 	return (
 		<Dialog>
-			<DialogTrigger>
+			<DialogTrigger asChild>
 				<Button variant="outline" size="icon">
 					<Info />
 				</Button>