1 files changed, 3 insertions, 0 deletions
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index d7b8594e..3a0a2fe2 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -30,6 +30,7 @@
 #include "gui/buy.h"
 #include "gui/buysell.h"
 #include "gui/gui.h"
+#include "gui/npcdialog.h"
 #include "gui/okdialog.h"
 #include "gui/sell.h"
 #include "gui/statuswindow.h"
@@ -87,6 +88,8 @@ namespace {
             if (storageWindow->isVisible())
                 storageWindow->close();
             viewport->closePopupMenu();
+            npcDialog->closeDialog();
+            current_npc = 0;
         }
     } deathListener;