diff --git a/ui/src/formkit/theme.ts b/ui/src/formkit/theme.ts
index 52dfba5de..499ae0231 100644
--- a/ui/src/formkit/theme.ts
+++ b/ui/src/formkit/theme.ts
@@ -29,7 +29,7 @@ const theme: Record<string, Record<string, string>> = {
   global: {
     form: "divide-y divide-gray-100",
     outer:
-      "formkit-disabled:opacity-50 py-4 first:pt-0 last:pb-0 transition-all",
+      "formkit-disabled:opacity-70 formkit-disabled:cursor-not-allowed formkit-disabled:pointer-events-none py-4 first:pt-0 last:pb-0 transition-all",
     help: "text-xs mt-2 text-gray-500",
     messages: "list-none p-0 mt-1.5 mb-0 transition-all",
     message: "text-red-500 mt-2 text-xs",
diff --git a/ui/src/styles/tailwind.css b/ui/src/styles/tailwind.css
index 360a0cec8..46cdac3bf 100644
--- a/ui/src/styles/tailwind.css
+++ b/ui/src/styles/tailwind.css
@@ -22,5 +22,5 @@ textarea {
 }
 
 input[type="checkbox"] {
-  @apply rounded-sm border-gray-500 disabled:bg-gray-200 disabled:opacity-50;
+  @apply rounded-sm border-gray-500 disabled:cursor-not-allowed disabled:border-gray-400 disabled:opacity-50 disabled:checked:border-none;
 }