diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java
index f8333cc2b..5b98bdca4 100644
--- a/src/main/java/noppes/npcs/ServerEventsHandler.java
+++ b/src/main/java/noppes/npcs/ServerEventsHandler.java
@@ -285,6 +285,16 @@ public class ServerEventsHandler {
         }
     }
 
+    @SubscribeEvent
+    public void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) {
+        if (event.player == null || event.player.worldObj == null || event.player.worldObj.isRemote)
+            return;
+
+        PlayerData data = PlayerData.get(event.player);
+        data.setGUIOpen(false);
+        data.editingNpc = null;
+    }
+
     private void doExcalibur(EntityPlayer player, EntityLivingBase entity) {
         ItemStack item = player.getCurrentEquippedItem();
         if (item == null || item.getItem() != CustomItems.excalibur)