diff --git a/source/funkin/ui/stageBuildShit/StageEditorCommand.hx b/source/funkin/ui/stageBuildShit/StageEditorCommand.hx
index 87d3f1a01..89639178f 100644
--- a/source/funkin/ui/stageBuildShit/StageEditorCommand.hx
+++ b/source/funkin/ui/stageBuildShit/StageEditorCommand.hx
@@ -61,7 +61,12 @@ class SelectPropCommand implements StageEditorCommand
 
   public function undo(state:StageOffsetSubstate):Void
   {
+    var funnyShader = state.char.shader;
+    if (state.char != null) state.char.shader = null;
     state.char = this.prevProp;
+
+    // I KNOW, TWO DAMN NULL CHECKS IN A SINGLE FUNCTION! FUK U
+    if (state.char != null) state.char.shader = funnyShader;
   }
 
   public function toString():String