diff --git a/src/main/java/com/gtnh/findit/fx/ParticlePosition.java b/src/main/java/com/gtnh/findit/fx/ParticlePosition.java
index c8c1a4c..3e11e12 100644
--- a/src/main/java/com/gtnh/findit/fx/ParticlePosition.java
+++ b/src/main/java/com/gtnh/findit/fx/ParticlePosition.java
@@ -49,13 +49,14 @@ public void renderParticle(final Tessellator tessellator, float partialTickTime,
             float rotationYZ, float rotationXY, float rotationXZ) {
         tessellator.draw();
 
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
         GL11.glDisable(GL11.GL_DEPTH_TEST);
 
         tessellator.startDrawingQuads();
         super.renderParticle(tessellator, partialTickTime, rotationX, rotationZ, rotationYZ, rotationXY, rotationXZ);
         tessellator.draw();
 
-        GL11.glEnable(GL11.GL_DEPTH_TEST);
+        GL11.glPopAttrib();
         tessellator.startDrawingQuads();
     }
 
diff --git a/src/main/java/com/gtnh/findit/fx/SlotHighlighter.java b/src/main/java/com/gtnh/findit/fx/SlotHighlighter.java
index 051f5f5..f87661d 100644
--- a/src/main/java/com/gtnh/findit/fx/SlotHighlighter.java
+++ b/src/main/java/com/gtnh/findit/fx/SlotHighlighter.java
@@ -54,7 +54,11 @@ public void renderSlotOverlay(GuiContainer gui, Slot slot) {}
     @Override
     public void renderSlotUnderlay(GuiContainer gui, Slot slot) {
         if (this.gui == gui && this.slots.contains(slot)) {
-            GL11.glPushMatrix();
+            GL11.glPushAttrib(
+                    GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT
+                            | GL11.GL_CURRENT_BIT
+                            | GL11.GL_LIGHTING_BIT
+                            | GL11.GL_TEXTURE_BIT);
 
             GL11.glDisable(GL11.GL_LIGHTING);
             GL11.glDisable(GL11.GL_ALPHA_TEST);
@@ -71,12 +75,7 @@ public void renderSlotUnderlay(GuiContainer gui, Slot slot) {
             highlightSlot(tessellator, slot.xDisplayPosition, slot.yDisplayPosition);
             tessellator.draw();
 
-            GL11.glShadeModel(GL11.GL_FLAT);
-            GL11.glDisable(GL11.GL_BLEND);
-            GL11.glEnable(GL11.GL_ALPHA_TEST);
-            GL11.glEnable(GL11.GL_LIGHTING);
-
-            GL11.glPopMatrix();
+            GL11.glPopAttrib();
         }
     }