diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java
index 7bf3ed03a..5e61e605e 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java
@@ -247,7 +247,7 @@ public class GuiNPCManageDialogs extends GuiNPCInterface2 implements IScrollGrou
 
 		boolean diagEnabled = dialogData != null;
 		if(diagEnabled){
-			if(!(dialog.id >= 0)){
+			if(dialog == null ||!(dialog.id >= 0)){
 				diagEnabled = false;
 			}
 		}
@@ -333,6 +333,13 @@ public class GuiNPCManageDialogs extends GuiNPCInterface2 implements IScrollGrou
 			String selected = catScroll.getSelected();
 			if(!selected.equals(prevCatName) || override){
 				category = new DialogCategory();
+
+                dialogScroll.selected = -1;
+                dialogScroll.resetScroll();
+                diagSearch = "";
+                dialog = null;
+                getTextField(66).setText("");
+
 				Client.sendData(EnumPacketServer.DialogCategoryGet, catData.get(selected));
 				setPrevCatName(selected);
 			}
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java
index 11c292d66..0b3ec4ce5 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java
@@ -251,7 +251,7 @@ public class GuiNPCManageQuest extends GuiNPCInterface2 implements IScrollGroup,
 
 		boolean questEnabled = questData != null;
 		if(questEnabled){
-			if(!(quest.id >= 0)){
+			if(quest == null || !(quest.id >= 0)){
 				questEnabled = false;
 			}
 		}
@@ -337,6 +337,13 @@ public class GuiNPCManageQuest extends GuiNPCInterface2 implements IScrollGroup,
 			String selected = catScroll.getSelected();
 			if(!selected.equals(prevCatName) || override){
 				category = new QuestCategory();
+
+                questScroll.selected = -1;
+                questScroll.resetScroll();
+                questSearch = "";
+                quest = null;
+                getTextField(66).setText("");
+
 				Client.sendData(EnumPacketServer.QuestCategoryGet, catData.get(selected));
 				setPrevCatName(selected);
 			}