diff --git a/ivolution/gui/IvolutionTemplate.py b/ivolution/gui/IvolutionTemplate.py
index 607c53b..98254fa 100644
--- a/ivolution/gui/IvolutionTemplate.py
+++ b/ivolution/gui/IvolutionTemplate.py
@@ -111,6 +111,7 @@ class IvolutionTemplate ( wx.Frame ):
 		self.Centre( wx.BOTH )
 
 		# Connect Events
+		self.Bind( wx.EVT_CLOSE, self.on_exit )
 		self.Bind( wx.EVT_MENU, self.on_exit, id = self.exititem.GetId() )
 		self.Bind( wx.EVT_MENU, self.on_help, id = self.helpitem.GetId() )
 		self.Bind( wx.EVT_MENU, self.on_about, id = self.aboutitem.GetId() )
@@ -128,6 +129,7 @@ class IvolutionTemplate ( wx.Frame ):
 	def on_exit( self, event ):
 		event.Skip()
 
+
 	def on_help( self, event ):
 		event.Skip()
 
diff --git a/ivolution/gui/IvolutionWindow.py b/ivolution/gui/IvolutionWindow.py
index d300cba..5df0107 100644
--- a/ivolution/gui/IvolutionWindow.py
+++ b/ivolution/gui/IvolutionWindow.py
@@ -199,7 +199,8 @@ either expressed or implied, of the FreeBSD Project."""
         # Clean up code for saving application state should be added here.
         self.notify(["Application", ["STOP"]])  # Asking the Facemovie to stop
         self.process_running = False
-        self.Close(True)  # Close the frame.
+        #self.Close(True)  # Close the frame.
+        sys.exit(0)
 
     # system methods
     def get_current_mode(self):