diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java
index ad5cc9795..c6d0d6e1d 100644
--- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java
+++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java
@@ -172,6 +172,10 @@ public class GuiNpcMobSpawnerAdd extends GuiNPCInterface implements GuiYesNoCall
 
 	@Override
 	public void subGuiClosed(SubGuiInterface subgui) {
+		if(subgui instanceof SubGuiClonerNPCTags){
+			close();
+			return;
+		}
 		initGui();
 	}
 
diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java b/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java
index 3a7b608dd..52e69763d 100644
--- a/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java
+++ b/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java
@@ -86,6 +86,7 @@ public class SubGuiClonerNPCTags extends SubGuiInterface implements IGuiData,ISc
             tagNames.clear();
         }
         if (guibutton.id == 66) {
+            save();
             close();
         }
         initGui();
@@ -154,11 +155,4 @@ public class SubGuiClonerNPCTags extends SubGuiInterface implements IGuiData,ISc
         }
         return list;
     }
-
-    @Override
-    public void close() {
-        save();
-        super.close();
-    }
-
 }