diff --git a/source/main.pas b/source/main.pas
index 5e769431..fbd5cb01 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -1508,8 +1508,8 @@ begin
     if not Assigned(SessionManager) then
       SessionManager := TConnForm.Create(Self);
     if SessionManager.ShowModal = mrCancel then begin
-      Close;
-      Halt;
+      Free;
+      Exit;
     end;
   end;