diff --git a/src/pswui/components/Button.tsx b/src/pswui/components/Button.tsx
index 586027b..b197662 100644
--- a/src/pswui/components/Button.tsx
+++ b/src/pswui/components/Button.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import { vcn, VariantProps, Slot, AsChild } from "@pswui-lib";
 
 const colors = {
+  disabled: "disabled:brightness-50 disabled:cursor-not-allowed disabled:opacity-50 disabled:saturate-50",
   outline: {
     focus: "dark:focus-visible:outline-white/20 focus-visible:outline-black/10",
   },
@@ -26,7 +27,7 @@ const colors = {
 };
 
 const [buttonVariants, resolveVariants] = vcn({
-  base: `w-fit flex flex-row items-center justify-between rounded-md outline outline-1 outline-transparent outline-offset-2 ${colors.outline.focus} transition-all`,
+  base: `w-fit flex flex-row items-center justify-between rounded-md outline outline-1 outline-transparent outline-offset-2 ${colors.outline.focus} ${colors.disabled} transition-all cursor-pointer`,
   variants: {
     size: {
       link: "p-0 text-base",
diff --git a/src/pswui/components/Popover.tsx b/src/pswui/components/Popover.tsx
index 4f2ff0e..de29b7b 100644
--- a/src/pswui/components/Popover.tsx
+++ b/src/pswui/components/Popover.tsx
@@ -107,8 +107,11 @@ const PopoverContent = React.forwardRef<HTMLDivElement, PopoverContentProps>(
     const internalRef = useRef<HTMLDivElement | null>(null);
 
     useEffect(() => {
-      function handleOutsideClick(e: any) {
-        if (internalRef.current && !internalRef.current.contains(e.target)) {
+      function handleOutsideClick(e: MouseEvent) {
+        if (
+          internalRef.current &&
+          !internalRef.current.contains(e.target as Node | null)
+        ) {
           setState((prev) => ({ ...prev, opened: false }));
         }
       }