diff --git a/retroshare-gui/src/rshare.cpp b/retroshare-gui/src/rshare.cpp
index 933921f88..2b86834e2 100644
--- a/retroshare-gui/src/rshare.cpp
+++ b/retroshare-gui/src/rshare.cpp
@@ -83,6 +83,8 @@ Rshare::Rshare(QStringList args, int &argc, char **argv, QString dir)
   /** Set the GUI stylesheet appropriately. */
   setSheet(_args.value(ARG_GUISTYLESHEET));
 
+  /* Switch off auto shutdown */
+  setQuitOnLastWindowClosed ( false );
 }
 
 /** Destructor */