diff --git a/src/loadsave.c b/src/loadsave.c
index 7ef8bc23..5cf7051b 100644
--- a/src/loadsave.c
+++ b/src/loadsave.c
@@ -969,7 +969,8 @@ void Save_image(T_IO_Context *context)
   {
     case CONTEXT_MAIN_IMAGE:
       if (!File_formats[context->Format-1].Supports_layers
-        && Main_backups->Pages->Nb_layers > 1)
+        && Main_backups->Pages->Nb_layers > 1
+        && !File_formats[context->Format-1].Palette_only)
       {
         if (Main_backups->Pages->Image_mode == IMAGE_MODE_ANIMATION)
         {
diff --git a/src/main.c b/src/main.c
index 3e0359ef..ac8ca984 100644
--- a/src/main.c
+++ b/src/main.c
@@ -868,6 +868,10 @@ int Init_program(int argc,char * argv[])
           Destroy_context(&context);
           Redraw_layered_image();
           End_of_modification();
+
+          // If only one image was loaded, assume the spare has same image type
+          if (file_in_command_line==1)
+            Spare_backups->Pages->Image_mode = Main_backups->Pages->Image_mode;
           
           Hide_cursor();
           Compute_optimal_menu_colors(Main_palette);