diff --git a/src/llconclientdlg.cpp b/src/llconclientdlg.cpp
index d0d49214..5aad5033 100755
--- a/src/llconclientdlg.cpp
+++ b/src/llconclientdlg.cpp
@@ -207,6 +207,9 @@ CLlconClientDlg::~CLlconClientDlg()
 
 void CLlconClientDlg::closeEvent ( QCloseEvent * Event )
 {
+    // if settings dialog is open, close it
+    ClientSettingsDlg.close();
+
     // store IP address
     pClient->strIPAddress = LineEditServerAddr->text();