diff --git a/src/main/scala/li/cil/oc/client/gui/Waypoint.scala b/src/main/scala/li/cil/oc/client/gui/Waypoint.scala
index 3b545be13..b5b2d3230 100644
--- a/src/main/scala/li/cil/oc/client/gui/Waypoint.scala
+++ b/src/main/scala/li/cil/oc/client/gui/Waypoint.scala
@@ -60,6 +60,7 @@ class Waypoint(val waypoint: tileentity.Waypoint) extends GuiScreen {
         if (label != waypoint.label) {
           waypoint.label = label
           PacketSender.sendWaypointLabel(waypoint)
+          mc.thePlayer.closeScreen()
         }
       }
       else super.keyTyped(char, code)