diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 2efef78970d..63cf59c094e 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -745,8 +745,8 @@ void BKE_add_image_extension(char *string, int imtype)
 		if(!BLI_testextensie(string, ".tga"))
 			extension= ".tga";
 	}
-	else if(ELEM5(imtype, R_MOVIE, R_AVICODEC, R_AVIRAW, R_AVIJPEG, R_JPEG90)) {
-		if(!BLI_testextensie(string, ".jpg"))
+	else if(ELEM6(imtype, R_MOVIE, R_AVICODEC, R_AVIRAW, R_AVIJPEG, R_JPEG90, R_FFMPEG)) {
+		if(!( BLI_testextensie(string, ".jpg") || BLI_testextensie(string, ".jpeg")))
 			extension= ".jpg";
 	}
 	else if(imtype==R_BMP) {
diff --git a/source/blender/src/writeimage.c b/source/blender/src/writeimage.c
index cb3d4158ec1..b6279f7eb6b 100644
--- a/source/blender/src/writeimage.c
+++ b/source/blender/src/writeimage.c
@@ -193,6 +193,7 @@ void save_image_filesel_str(char *str)
 			strcpy(str, "Save Multi Layer EXR");
 			break;
 			/* default we save jpeg, also for all movie formats */
+		case R_FFMPEG:
 		case R_JPEG90:
 		case R_MOVIE:
 		case R_AVICODEC: