diff --git a/MainWindow.cs b/MainWindow.cs
index 4a04a20..ec8a869 100755
--- a/MainWindow.cs
+++ b/MainWindow.cs
@@ -120,6 +120,7 @@ namespace Buypeeb {
 		}
 
 		private void Window_Shutdown(object sender, DeleteEventArgs args) {
+			SaveSettings();
 			Application.Quit();
 		}
 
@@ -252,6 +253,7 @@ namespace Buypeeb {
 
 		private void ButtonSaveClicked(object sender, EventArgs a) {
 			Console.WriteLine("ButtonSaveClicked");
+			this.SaveSettings();
 		}
 
 		private void ButtonQuitClicked(object sender, EventArgs a) {
@@ -259,6 +261,7 @@ namespace Buypeeb {
 			ResponseType response = (ResponseType)md.Run();
 			md.Dispose();
 			if (response == ResponseType.Ok) {
+				this.SaveSettings();
 				Application.Quit();
 			}
 		}