diff --git a/ChangeLog b/ChangeLog
index f0746a42..191729da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-25  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * plugins/saveactions.c:
+   Fix adding the filetype's default extension when using the
+   Instant Save plugin (2885142).
+
+
 2009-10-23  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/interface.c, src/ui_utils.h, src/prefs.c, src/keyfile.c,
diff --git a/plugins/saveactions.c b/plugins/saveactions.c
index f7da3389..5da58f78 100644
--- a/plugins/saveactions.c
+++ b/plugins/saveactions.c
@@ -250,7 +250,7 @@ static void instantsave_document_new_cb(GObject *obj, GeanyDocument *doc, gpoint
 		if (fd != -1)
 			close(fd); /* close the returned file descriptor as we only need the filename */
 
-		if (ft == NULL)
+		if (ft == NULL || ft->id == GEANY_FILETYPES_NONE)
 			/* ft is NULL when a new file without template was opened, so use the
 			 * configured default file type */
 			ft = filetypes_lookup_by_name(instantsave_default_ft);