diff --git a/site/src/pages/TemplateBuilder/ModuleSelectStep.stories.tsx b/site/src/pages/TemplateBuilder/ModuleSelectStep.stories.tsx
new file mode 100644
index 0000000000..71b5405466
--- /dev/null
+++ b/site/src/pages/TemplateBuilder/ModuleSelectStep.stories.tsx
@@ -0,0 +1,115 @@
+import type { Meta, StoryObj } from "@storybook/react-vite";
+import { expect, fn, userEvent, within } from "storybook/test";
+import type { TemplateBuilderModule } from "#/api/typesGenerated";
+import { ModuleSelectStep } from "./ModuleSelectStep";
+
+const baseId = "docker";
+
+function makeModule(
+	overrides: Partial<TemplateBuilderModule> &
+		Pick<TemplateBuilderModule, "id" | "display_name" | "category">,
+): TemplateBuilderModule {
+	return {
+		description: "",
+		icon: "",
+		version: "1.0.0",
+		compatible_os: ["linux"],
+		conflicts_with: [],
+		variables: [],
+		...overrides,
+	};
+}
+
+const modules: TemplateBuilderModule[] = [
+	{
+		id: "code-server",
+		display_name: "code-server",
+		description: "Run VS Code in the browser.",
+		category: "IDE",
+		icon: "/icon/code.svg",
+	},
+	{
+		id: "jetbrains-gateway",
+		display_name: "JetBrains Gateway",
+		description: "Connect JetBrains IDEs to your workspace.",
+		category: "IDE",
+	},
+	{
+		id: "git-clone",
+		display_name: "Git Clone",
+		description: "Clone a git repository on workspace start.",
+		category: "Source Control",
+	},
+	{
+		id: "claude-code",
+		display_name: "Claude Code",
+		description: "Run Claude Code in your workspace.",
+		category: "AI",
+	},
+	{
+		id: "jfrog-artifactory",
+		display_name: "JFrog Artifactory",
+		description: "Configure JFrog Artifactory access.",
+		category: "Security",
+	},
+].map(makeModule);
+
+const meta: Meta<typeof ModuleSelectStep> = {
+	title: "pages/TemplateBuilder/ModuleSelectStep",
+	component: ModuleSelectStep,
+	args: {
+		baseId,
+		selectedModuleIds: [],
+		onChangeModules: fn(),
+	},
+	parameters: {
+		queries: [
+			{
+				key: ["templateBuilder", "modules", baseId],
+				data: { modules },
+			},
+		],
+	},
+};
+
+export default meta;
+type Story = StoryObj<typeof ModuleSelectStep>;
+
+export const Default: Story = {};
+
+export const Loading: Story = {
+	parameters: {
+		queries: [],
+	},
+};
+
+// Verifies that the category filter tab counts reflect the active search.
+// Searching "code" matches only code-server (IDE) and Claude Code (AI), so
+// those tab counts drop while non-matching categories fall to zero but stay
+// visible.
+export const FilterCountsUpdateOnSearch: Story = {
+	play: async ({ canvasElement }) => {
+		const canvas = within(canvasElement);
+
+		// Counts before searching reflect every module.
+		await canvas.findByRole("tab", { name: /All \(5\)/ });
+		await canvas.findByRole("tab", { name: /IDE \(2\)/ });
+		await canvas.findByRole("tab", { name: /AI \(1\)/ });
+
+		const search = canvas.getByPlaceholderText("Search modules...");
+		await userEvent.type(search, "code");
+
+		// Counts after searching reflect only matching modules per category.
+		await canvas.findByRole("tab", { name: /All \(2\)/ });
+		await canvas.findByRole("tab", { name: /IDE \(1\)/ });
+		await canvas.findByRole("tab", { name: /AI \(1\)/ });
+		// Non-matching categories stay visible with a zero count.
+		await canvas.findByRole("tab", { name: /Source Control \(0\)/ });
+		await canvas.findByRole("tab", { name: /Security \(0\)/ });
+
+		// Only matching modules render in the grid.
+		await expect(canvas.getByText("code-server")).toBeInTheDocument();
+		await expect(canvas.getByText("Claude Code")).toBeInTheDocument();
+		await expect(canvas.queryByText("Git Clone")).not.toBeInTheDocument();
+	},
+};