diff --git a/ChangeLog b/ChangeLog
index 8cf9587e4..33338aa44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
    Add *.desktop as extension for the Conf filetype.
  * *.*:
    Update copyright information
+ * plugins/saveactions.c:
+   Don't write the default filetype to the config if it isn't set.
 
 
 2009-01-03  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
diff --git a/plugins/saveactions.c b/plugins/saveactions.c
index 36f0b4867..666eda2fa 100644
--- a/plugins/saveactions.c
+++ b/plugins/saveactions.c
@@ -455,7 +455,8 @@ static void configure_response_cb(GtkDialog *dialog, gint response, G_GNUC_UNUSE
 		g_key_file_set_boolean(config, "autosave", "save_all", autosave_save_all);
 		g_key_file_set_integer(config, "autosave", "interval", autosave_interval);
 
-		g_key_file_set_string(config, "instantsave", "default_ft", instantsave_default_ft);
+		if (instantsave_default_ft != NULL)
+			g_key_file_set_string(config, "instantsave", "default_ft", instantsave_default_ft);
 
 		g_key_file_set_integer(config, "backupcopy", "dir_levels", backupcopy_dir_levels);
 		g_key_file_set_string(config, "backupcopy", "time_fmt", text_time);