diff --git a/.vs/Toolbox/v15/.suo b/.vs/Toolbox/v15/.suo
index 7a576ab9..77e15908 100644
Binary files a/.vs/Toolbox/v15/.suo and b/.vs/Toolbox/v15/.suo differ
diff --git a/File_Format_Library/GUI/Editors/PTCL/EmitterEditorNX.cs b/File_Format_Library/GUI/Editors/PTCL/EmitterEditorNX.cs
index ed6368c7..1be76692 100644
--- a/File_Format_Library/GUI/Editors/PTCL/EmitterEditorNX.cs
+++ b/File_Format_Library/GUI/Editors/PTCL/EmitterEditorNX.cs
@@ -108,17 +108,20 @@ namespace FirstPlugin
                 ActivePanel = panel;
                 if (ActivePanel.IsAlpha)
                 {
+                    int alpha = panel.GetColor().R;
+
                     colorSelector1.DisplayColor = false;
                     colorSelector1.DisplayAlpha = true;
-                    colorSelector1.Alpha = panel.GetColor().R;
+                    colorSelector1.Alpha = alpha;
+                    UpdateColorSelector(Color.FromArgb(alpha, alpha, alpha));
                 }
                 else
                 {
                     colorSelector1.DisplayColor = true;
                     colorSelector1.DisplayAlpha = false;
+                    UpdateColorSelector(panel.GetColor());
                 }
 
-                UpdateColorSelector(panel.GetColor());
 
                 if (panel is Color8KeySlider)
                     UpdateTimeDisplay(((Color8KeySlider)panel).GetTime());
diff --git a/Switch_Toolbox_Library/Forms/ColorSelector.cs b/Switch_Toolbox_Library/Forms/ColorSelector.cs
index 1d8b8cd5..f49efca7 100644
--- a/Switch_Toolbox_Library/Forms/ColorSelector.cs
+++ b/Switch_Toolbox_Library/Forms/ColorSelector.cs
@@ -30,10 +30,7 @@ namespace Toolbox.Library.Forms
         {
             get
             {
-                if (DisplayColor)
-                    return _color;
-                else
-                    return Color.FromArgb(Alpha, Alpha, Alpha);
+                return _color;
             }
             set
             {
@@ -61,7 +58,7 @@ namespace Toolbox.Library.Forms
             set
             {
                 displayAlpha = value;
-                alphaPanel.Enabled = displayAlpha;
+                alphaPanel.Visible = displayAlpha;
             }
         }
 
@@ -370,6 +367,9 @@ namespace Toolbox.Library.Forms
                     alphaY = y;
                     Alpha = (byte)(255 - ((float)y / (alphaPanel.Height - 1) * 255));
 
+                    if (!huePanel.Enabled)
+                        _color = Color.FromArgb(Alpha, Alpha, Alpha); 
+
                     if (ColorChanged != null)
                         ColorChanged(this, null);
                 }
@@ -415,7 +415,7 @@ namespace Toolbox.Library.Forms
             {
                 int x = Math.Min(Math.Max(e.X, 0), colorSquare.Width);
                 int y = Math.Min(Math.Max(e.Y, 0), colorSquare.Height);
-                if (!DisplayColor)
+                if (!huePanel.Enabled)
                     y = colorSquare.Height;
 
                 if ((x != _squareX) || (y != _squareY))
@@ -424,6 +424,11 @@ namespace Toolbox.Library.Forms
                     _hsv.S = (byte)((float)(colorSquare.Height - y) / colorSquare.Height * 100);
 
                     OnColorChanged(true);
+
+                    if (!huePanel.Enabled) {
+                        Alpha = _color.R;
+                        alphaPanel.Invalidate();
+                    }
                 }
             }
         }
diff --git a/Switch_Toolbox_Library/Toolbox.Library.dll b/Switch_Toolbox_Library/Toolbox.Library.dll
index eca39a46..8639dad9 100644
Binary files a/Switch_Toolbox_Library/Toolbox.Library.dll and b/Switch_Toolbox_Library/Toolbox.Library.dll differ
diff --git a/Switch_Toolbox_Library/Toolbox.Library.pdb b/Switch_Toolbox_Library/Toolbox.Library.pdb
index bdace033..851976ef 100644
Binary files a/Switch_Toolbox_Library/Toolbox.Library.pdb and b/Switch_Toolbox_Library/Toolbox.Library.pdb differ