diff --git a/src/main/scala/li/cil/oc/client/Textures.scala b/src/main/scala/li/cil/oc/client/Textures.scala
index 7d2cebedf..42cdaa50c 100644
--- a/src/main/scala/li/cil/oc/client/Textures.scala
+++ b/src/main/scala/li/cil/oc/client/Textures.scala
@@ -2,6 +2,7 @@ package li.cil.oc.client
 
 import li.cil.oc.Settings
 import net.minecraft.util.ResourceLocation
+import net.minecraft.client.renderer.texture.TextureManager
 
 object Textures {
   val fontAntiAliased = new ResourceLocation(Settings.resourceDomain, "textures/font/chars.png")
@@ -28,4 +29,31 @@ object Textures {
 
   val upgradeCrafting = new ResourceLocation(Settings.resourceDomain, "textures/items/upgrade_crafting_equipped.png")
   val upgradeGenerator = new ResourceLocation(Settings.resourceDomain, "textures/items/upgrade_generator_equipped.png")
+
+  def init(tm: TextureManager) {
+    tm.bindTexture(fontAntiAliased)
+    tm.bindTexture(fontAliased)
+
+    tm.bindTexture(guiBackground)
+    tm.bindTexture(guiBorders)
+    tm.bindTexture(guiButtonPower)
+    tm.bindTexture(guiButtonRange)
+    tm.bindTexture(guiButtonSide)
+    tm.bindTexture(guiComputer)
+    tm.bindTexture(guiRange)
+    tm.bindTexture(guiRobot)
+    tm.bindTexture(guiRobotSelection)
+    tm.bindTexture(guiServer)
+    tm.bindTexture(guiSlot)
+
+    tm.bindTexture(blockCable)
+    tm.bindTexture(blockCaseFrontOn)
+    tm.bindTexture(blockHologram)
+    tm.bindTexture(blockRackFrontOn)
+    tm.bindTexture(blockRobot)
+    tm.bindTexture(blockScreenUpIndicator)
+
+    tm.bindTexture(upgradeCrafting)
+    tm.bindTexture(upgradeGenerator)
+  }
 }
diff --git a/src/main/scala/li/cil/oc/client/renderer/gui/BufferRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/gui/BufferRenderer.scala
index c4dcd4433..11178f873 100644
--- a/src/main/scala/li/cil/oc/client/renderer/gui/BufferRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/gui/BufferRenderer.scala
@@ -20,6 +20,7 @@ object BufferRenderer {
     textureManager = Some(tm)
     displayLists = GLAllocation.generateDisplayLists(2)
     RenderState.checkError("BufferRenderer.displayLists")
+    Textures.init(tm)
   })
 
   def compileBackground(bufferWidth: Int, bufferHeight: Int) =