diff --git a/app/components/skin_dialog.tsx b/app/components/skin_dialog.tsx
index 04d088b..237dd67 100644
--- a/app/components/skin_dialog.tsx
+++ b/app/components/skin_dialog.tsx
@@ -23,10 +23,10 @@ export function SkinDialog({
     setSkin: Dispatch<SetStateAction<WeaponInfo | AgentInfo>>;
     side: "T" | "CT";
 }) {
-    const acolor = `${skin.color}64`;
     const [selectorOpen, setSelectorOpen] = useState(false);
     const [canClose, setCanClose] = useState(true);
     const [localSkin, setLocalSkin] = useState(skin);
+    const acolor = `${localSkin.color}64`;
 
     const handleInputChange = (event: ChangeEvent<HTMLInputElement>) => {
         if (localSkin instanceof AgentInfo) return;
diff --git a/app/components/skin_selector.tsx b/app/components/skin_selector.tsx
index cd183b8..d2288d7 100644
--- a/app/components/skin_selector.tsx
+++ b/app/components/skin_selector.tsx
@@ -35,10 +35,12 @@ export function SkinSelector({
             newSkin.display = newSkin.display.split("|")[0] + " | " + v.display;
             newSkin.min_float = v.min_float;
             newSkin.max_float = v.max_float;
+            newSkin.color = v.color;
             setSkin(newSkin);
         } else {
             const newSkin = new AgentInfo(skin);
             newSkin.name = v.name;
+            newSkin.color = v.color;
             setSkin(newSkin);
         }
     };
@@ -91,6 +93,7 @@ export function SkinSelector({
                                         <Button
                                             onClick={() => {
                                                 setPaint(v);
+                                                setIsOpen(false);
                                             }}
                                             className="flex flex-col w-full h-fit items-center justify-start"
                                         >
diff --git a/app/components/skin_tile.tsx b/app/components/skin_tile.tsx
index d09bef1..bc0a3e5 100644
--- a/app/components/skin_tile.tsx
+++ b/app/components/skin_tile.tsx
@@ -12,8 +12,8 @@ export function SkinTile({
     side: "T" | "CT";
 }) {
     const [isDialogOpen, setIsDialogOpen] = useState(false);
-    const acolor = `${skinInfo.color}64`;
     const [skin, setSkin] = useState(skinInfo);
+    const acolor = `${skin.color}64`;
     return (
         <>
             <SkinDialog