diff --git a/src/gajim.py b/src/gajim.py
index 6746989ff..04bf91907 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -384,6 +384,8 @@ def on_exit():
 	# delete pid file on normal exit
 	if os.path.exists(pid_filename):
 		os.remove(pid_filename)
+	# Save config
+	gajim.interface.save_config()
 	if sys.platform == 'darwin':
 		try:
 			import osx