diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/build-settings/watch-paths-settings.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/build-settings/watch-paths-settings.tsx
index 588c797194..c7075114ca 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/build-settings/watch-paths-settings.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/build-settings/watch-paths-settings.tsx
@@ -16,7 +16,7 @@ import { SettingDescription } from "../shared/setting-description";
 const watchPathsSchema = z.object({
   paths: z.array(
     z.object({
-      value: z.string().min(1, "Pattern cannot be empty"),
+      value: z.string(),
     }),
   ),
 });
@@ -45,6 +45,7 @@ export const WatchPaths = () => {
     handleSubmit,
     formState: { isValid, isSubmitting, errors },
     control,
+    reset,
   } = useForm<WatchPathsForm>({
     resolver: zodResolver(watchPathsSchema),
     mode: "onChange",
@@ -91,9 +92,20 @@ export const WatchPaths = () => {
     updateAllEnvironments((draft) => {
       draft.watchPaths = watchPaths;
     });
+    reset({ paths: toFormPaths(watchPaths) });
   };
 
-  const displayValue = defaultPaths.length > 0 ? defaultPaths.join(", ") : "All files (no filter)";
+  const displayValue =
+    defaultPaths.length > 0 ? (
+      <span className="flex items-center gap-1 truncate">
+        <span className="truncate">{defaultPaths[0]}</span>
+        {defaultPaths.length > 1 && (
+          <span className="shrink-0 text-gray-9">+{defaultPaths.length - 1}</span>
+        )}
+      </span>
+    ) : (
+      "All files (no filter)"
+    );
 
   return (
     <FormSettingCard
diff --git a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/shared/selected-config.tsx b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/shared/selected-config.tsx
index 8d67b7b53f..f4955413e2 100644
--- a/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/shared/selected-config.tsx
+++ b/web/apps/dashboard/app/(app)/[workspaceSlug]/projects/[projectId]/(overview)/settings/components/shared/selected-config.tsx
@@ -11,7 +11,7 @@ export const SelectedConfig = ({ label, className = "" }: SelectedConfigProps) =
     <Badge
       variant="secondary"
       className={cn(
-        "px-3 py-2 text-gray-11 text-[13px] border-grayA-4 bg-transparent hover:bg-grayA-3 cursor-default hover:text-gray-12 rounded-md focus:hover:bg-transparent h-7",
+        "px-3 py-2 text-gray-11 text-[13px] border-grayA-4 bg-transparent hover:bg-grayA-3 cursor-default hover:text-gray-12 rounded-md focus:hover:bg-transparent h-7 max-w-full overflow-hidden",
         className,
       )}
     >