diff --git a/data/prefs.lkshp b/data/prefs.lkshp
--- a/data/prefs.lkshp
+++ b/data/prefs.lkshp
@@ -54,6 +54,8 @@
                11111
 Server IP address :
                "127.0.0.1"
+End the server with last connection:
+               True
 Packages which are excluded from the modules pane:
                [Dependency (PackageName "ghc") AnyVersion]
 Automatically save all files before building:
diff --git a/data/prefscoll.lkshp b/data/prefscoll.lkshp
--- a/data/prefscoll.lkshp
+++ b/data/prefscoll.lkshp
@@ -6,3 +6,5 @@
                Just "http://www.leksah.org"
 Port number for server connection:
                11111
+End the server with last connection:
+               True
diff --git a/leksah.cabal b/leksah.cabal
--- a/leksah.cabal
+++ b/leksah.cabal
@@ -1,5 +1,5 @@
 name: leksah
-version: 0.8.0.1
+version: 0.8.0.3
 cabal-version: >=1.6
 build-type: Simple
 license: GPL
diff --git a/src/IDE/Core/Types.hs b/src/IDE/Core/Types.hs
--- a/src/IDE/Core/Types.hs
+++ b/src/IDE/Core/Types.hs
@@ -357,6 +357,7 @@
     ,   sourceDirectories   ::   [FilePath]
     ,   unpackDirectory     ::   Maybe FilePath
     ,   retreiveURL         ::   Maybe String
+    ,   endWithLastConn     ::   Bool
 } deriving(Eq,Show)
 
 data SearchHint = Forward | Backward | Insert | Delete | Initial
diff --git a/src/IDE/Leksah.hs b/src/IDE/Leksah.hs
--- a/src/IDE/Leksah.hs
+++ b/src/IDE/Leksah.hs
@@ -334,7 +334,8 @@
                         (SP.Prefs {SP.sourceDirectories = sourceDirectories newPrefs,
                                    SP.unpackDirectory   = unpackDirectory newPrefs,
                                    SP.retreiveURL       = retreiveURL newPrefs,
-                                   SP.serverPort        = serverPort newPrefs})
+                                   SP.serverPort        = serverPort newPrefs,
+                                   SP.endWithLastConn   = endWithLastConn newPrefs})
                 widgetDestroy dialog
                 mainQuit
                 firstBuild newPrefs
diff --git a/src/IDE/Pane/Preferences.hs b/src/IDE/Pane/Preferences.hs
--- a/src/IDE/Pane/Preferences.hs
+++ b/src/IDE/Pane/Preferences.hs
@@ -138,7 +138,8 @@
                         (SP.Prefs {SP.sourceDirectories = sourceDirectories newPrefs,
                                    SP.unpackDirectory   = unpackDirectory newPrefs,
                                    SP.retreiveURL       = retreiveURL newPrefs,
-                                   SP.serverPort        = serverPort newPrefs})
+                                   SP.serverPort        = serverPort newPrefs,
+                                   SP.endWithLastConn   = endWithLastConn newPrefs})
                     reflectIDE (modifyIDE_ (\ide -> ide{prefs = newPrefs})) ideR )
             closeB `onClicked` (reflectIDE (closePane prefsPane >> return ()) ideR )
             registerEvent notifier FocusIn (Left (\e -> do
@@ -476,6 +477,14 @@
             (\b a -> a{serverIP = b})
             (stringEditor (\ s -> not $ null s))
             (\i -> return ())
+    ,   mkFieldPP
+            (paraName <<<- ParaName "End the server with last connection" $ emptyParams)
+            (PP.text . show)
+            boolParser
+            endWithLastConn
+            (\b a -> a{endWithLastConn = b})
+            boolEditor
+            (\i -> return ())
     ]),
     ("Blacklist", VFDPP emptyParams [
         mkFieldPP
@@ -652,6 +661,7 @@
     ,   printBindResult     =   False
     ,   serverPort          =   11111
     ,   serverIP            =   "127.0.0.1"
+    ,   endWithLastConn     =   True
     }
 
 -- ------------------------------------------------------------