diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java
index cf59c85b..476fac14 100644
--- a/src/main/java/appeng/client/gui/AEBaseGui.java
+++ b/src/main/java/appeng/client/gui/AEBaseGui.java
@@ -42,6 +42,7 @@ import org.lwjgl.opengl.GL11;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.RenderItem;
 import net.minecraft.client.renderer.Tessellator;
@@ -266,12 +267,10 @@ public abstract class AEBaseGui extends GuiContainer
 					}
 					else
 					{
-						GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
 						GL11.glColor4f( 1.0F, 1.0F, 1.0F, 0.4F );
-						GL11.glEnable( GL11.GL_BLEND );
+						GlStateManager.enableBlend();
 						this.drawTexturedModalRect( ox + fs.xDisplayPosition - 1, oy + fs.yDisplayPosition - 1, fs.getSourceX() - 1, fs.getSourceY() - 1, 18, 18 );
 						GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
-						GL11.glPopAttrib();
 					}
 				}
 			}
diff --git a/src/main/java/appeng/client/gui/widgets/GuiTabButton.java b/src/main/java/appeng/client/gui/widgets/GuiTabButton.java
index 50fb4ce5..53148605 100644
--- a/src/main/java/appeng/client/gui/widgets/GuiTabButton.java
+++ b/src/main/java/appeng/client/gui/widgets/GuiTabButton.java
@@ -23,6 +23,7 @@ import org.lwjgl.opengl.GL11;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.RenderItem;
 import net.minecraft.item.ItemStack;
@@ -101,8 +102,10 @@ public class GuiTabButton extends GuiButton implements ITooltip
 				this.zLevel = 100.0F;
 				this.itemRenderer.zLevel = 100.0F;
 
+				GlStateManager.enableDepth();
 				RenderHelper.enableGUIStandardItemLighting();
 				this.itemRenderer.renderItemAndEffectIntoGUI( this.myItem, offsetX + this.xPosition + 3, this.yPosition + 3 );
+				GlStateManager.disableDepth();
 
 				this.itemRenderer.zLevel = 0.0F;
 				this.zLevel = 0.0F;