diff --git a/buildnumber.txt b/buildnumber.txt
index fecee22c..bf0b9f89 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-2677
\ No newline at end of file
+2678
\ No newline at end of file
diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx
index c821c583..9ecd76f4 100644
--- a/source/funkin/editors/charter/Charter.hx
+++ b/source/funkin/editors/charter/Charter.hx
@@ -195,6 +195,8 @@ class Charter extends UIState {
                         selection = [n];
                 }
                 if (FlxG.mouse.justReleasedRight) {
+                    if (!selection.contains(n))
+                        selection = [n];
                     openContextMenu(topMenu[1].childs);
                 }
             }
@@ -202,6 +204,9 @@ class Charter extends UIState {
         for(n in selection)
             n.selected = true;
 
+        if (gridBackdropDummy.hovered && FlxG.mouse.justReleasedRight)
+            openContextMenu(topMenu[2].childs);
+
         super.update(elapsed);
 
         gridBackdrop.strumlinesAmount = 3;
diff --git a/source/funkin/shaders/FunkinShader.hx b/source/funkin/shaders/FunkinShader.hx
index 84f69dd1..ae23e63a 100644
--- a/source/funkin/shaders/FunkinShader.hx
+++ b/source/funkin/shaders/FunkinShader.hx
@@ -343,13 +343,13 @@ class FunkinShader extends FlxShader implements IHScriptCustomBehaviour {
         var cl = Std.string(Type.getClass(field));
 
         // cant do "field is ShaderInput" for some reason
-        if (cl.startsWith("openfl.display.ShaderInput")) {
-            var si = cast(field, ShaderInput<Dynamic>);
-            return si.input;
-        } else if (field is ShaderParameter) {
+        if (field is ShaderParameter) {
             var sp = cast(field, ShaderParameter<Dynamic>);
             @:privateAccess
             return (sp.__length > 1) ? sp.value : sp.value[0];
+        } else if (cl.startsWith("openfl.display.ShaderInput")) {
+            var si = cast(field, ShaderInput<Dynamic>);
+            return si.input;
         }
         return field;
     }