diff --git a/src/main/scala/li/cil/oc/common/tileentity/Screen.scala b/src/main/scala/li/cil/oc/common/tileentity/Screen.scala
index 1caa8a76b..8f061df85 100644
--- a/src/main/scala/li/cil/oc/common/tileentity/Screen.scala
+++ b/src/main/scala/li/cil/oc/common/tileentity/Screen.scala
@@ -5,6 +5,7 @@ import cpw.mods.fml.relauncher.SideOnly
 import li.cil.oc.Settings
 import li.cil.oc.api.network.Analyzable
 import li.cil.oc.api.network._
+import li.cil.oc.client.gui
 import li.cil.oc.common.component.TextBuffer
 import li.cil.oc.util.Color
 import li.cil.oc.util.ExtendedWorld._
@@ -271,6 +272,13 @@ class Screen(var tier: Int) extends traits.TextBuffer with SidedEnvironment with
   override def dispose() {
     super.dispose()
     screens.clone().foreach(_.checkMultiBlock())
+    if (isClient) {
+      Minecraft.getMinecraft.currentScreen match {
+        case screenGui: gui.Screen if screenGui.buffer == buffer =>
+          Minecraft.getMinecraft.displayGuiScreen(null)
+        case _ =>
+      }
+    }
   }
 
   override protected def onColorChanged() {