diff --git a/Plugins/Mineplex.Core/src/mineplex/core/report/ui/ReportCreatePage.java b/Plugins/Mineplex.Core/src/mineplex/core/report/ui/ReportCreatePage.java
index cc85826db..4ee980e93 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/report/ui/ReportCreatePage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/report/ui/ReportCreatePage.java
@@ -5,7 +5,6 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.bukkit.entity.Player;
-import org.bukkit.event.HandlerList;
 
 import mineplex.core.account.CoreClient;
 import mineplex.core.chatsnap.SnapshotManager;
@@ -51,9 +50,6 @@ public class ReportCreatePage extends SimpleGui implements  ReportCategoryCallba
 
 	public void addReport(ReportCategory category)
 	{
-		_reporter.closeInventory();
-		unregisterListener();
-
 		if (category == ReportCategory.CHAT_ABUSE)
 		{
 			if (hasSentMessage(_suspect.getAccountId()))
@@ -106,14 +102,10 @@ public class ReportCreatePage extends SimpleGui implements  ReportCategoryCallba
 				});
 	}
 
-	public void unregisterListener()
-	{
-		HandlerList.unregisterAll(this);
-	}
-
 	@Override
 	public void click(ReportCategoryButton button)
 	{
+		_reporter.closeInventory();
 		addReport(button.getCategory());
 	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/report/ui/ReportHandlePage.java b/Plugins/Mineplex.Core/src/mineplex/core/report/ui/ReportHandlePage.java
index dfdeb3fca..05e355caf 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/report/ui/ReportHandlePage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/report/ui/ReportHandlePage.java
@@ -50,6 +50,7 @@ public class ReportHandlePage extends SimpleGui implements ReportCategoryCallbac
 	@Override
 	public void click(ReportCategoryButton button)
 	{
+		_handler.closeInventory();
 		handleReport(button.getCategory());
 	}
 
@@ -107,7 +108,7 @@ public class ReportHandlePage extends SimpleGui implements ReportCategoryCallbac
 						}
 						else
 						{
-							UtilPlayer.message(_handler, F.main(_plugin.getName(), C.cRed + "No report found, report queue is empty."));
+							UtilPlayer.message(_handler, F.main(_plugin.getName(), C.cRed + "No open " + F.elem(category.getName()) + " report(s) found."));
 						}
 					}));
 				}