diff --git a/mRemoteNG/UI/Controls/ConnectionContextMenu.cs b/mRemoteNG/UI/Controls/ConnectionContextMenu.cs
index a2e5357c..320003a8 100644
--- a/mRemoteNG/UI/Controls/ConnectionContextMenu.cs
+++ b/mRemoteNG/UI/Controls/ConnectionContextMenu.cs
@@ -810,7 +810,7 @@ namespace mRemoteNG.UI.Controls
                                                         ESysIcons.Question);
                     if (CTaskDialog.VerificationChecked)
                     {
-                        Settings.Default.ConfirmCloseConnection--;
+                        Settings.Default.ConfirmCloseConnection = (int)ConfirmCloseEnum.Never;
                     }
 
                     if (result == DialogResult.No)
diff --git a/mRemoteNG/UI/Forms/frmMain.cs b/mRemoteNG/UI/Forms/frmMain.cs
index b1a38662..2e7ae7c2 100644
--- a/mRemoteNG/UI/Forms/frmMain.cs
+++ b/mRemoteNG/UI/Forms/frmMain.cs
@@ -470,7 +470,7 @@ namespace mRemoteNG.UI.Forms
                     DialogResult result = CTaskDialog.MessageBox(this, Application.ProductName, Language.ConfirmExitMainInstruction, "", "", "", Language.CheckboxDoNotShowThisMessageAgain, ETaskDialogButtons.YesNo, ESysIcons.Question, ESysIcons.Question);
                     if (CTaskDialog.VerificationChecked)
                     {
-                        Properties.Settings.Default.ConfirmCloseConnection--; //--?
+                        Properties.Settings.Default.ConfirmCloseConnection = (int)ConfirmCloseEnum.Never;
                     }
 
                     if (result == DialogResult.No)
diff --git a/mRemoteNG/UI/Tabs/ConnectionTab.cs b/mRemoteNG/UI/Tabs/ConnectionTab.cs
index 82d2926f..a6c1fbdd 100644
--- a/mRemoteNG/UI/Tabs/ConnectionTab.cs
+++ b/mRemoteNG/UI/Tabs/ConnectionTab.cs
@@ -55,7 +55,7 @@ namespace mRemoteNG.UI.Tabs
                                                             ESysIcons.Question);
                         if (CTaskDialog.VerificationChecked)
                         {
-                            Settings.Default.ConfirmCloseConnection--;
+                            Settings.Default.ConfirmCloseConnection = (int)ConfirmCloseEnum.Never;
                         }
 
                         if (result == DialogResult.No)
diff --git a/mRemoteNG/UI/Window/ConnectionWindow.cs b/mRemoteNG/UI/Window/ConnectionWindow.cs
index 506e88e3..f2c9485d 100644
--- a/mRemoteNG/UI/Window/ConnectionWindow.cs
+++ b/mRemoteNG/UI/Window/ConnectionWindow.cs
@@ -297,7 +297,7 @@ namespace mRemoteNG.UI.Window
                                                     ESysIcons.Question);
                 if (CTaskDialog.VerificationChecked)
                 {
-                    Settings.Default.ConfirmCloseConnection--;
+                    Settings.Default.ConfirmCloseConnection = (int)ConfirmCloseEnum.Never;
                 }
 
                 if (result == DialogResult.No)
@@ -662,7 +662,7 @@ namespace mRemoteNG.UI.Window
                                                     ESysIcons.Question);
                 if (CTaskDialog.VerificationChecked)
                 {
-                    Settings.Default.ConfirmCloseConnection--;
+                    Settings.Default.ConfirmCloseConnection = (int)ConfirmCloseEnum.Never;
                 }
 
                 if (result == DialogResult.No)