1 files changed, 15 insertions, 1 deletions
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index 64ffdc3f..df222797 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -54,8 +54,22 @@ BuySellDialog::BuySellDialog(Network *network):
                    getTitleBarHeight()), ImageRect::CENTER);
 
     loadWindowState();
+}
+
+void BuySellDialog::logic()
+{
+    Window::logic();
+
+    if (isVisible() && !current_npc)
+        setVisible(false);
+}
+
+void BuySellDialog::setVisible(bool visible)
+{
+    Window::setVisible(visible);
 
-    requestFocus();
+    if (visible)
+        requestFocus();
 }
 
 void BuySellDialog::action(const gcn::ActionEvent &event)