diff --git a/ChangeLog b/ChangeLog
index 7392aa94f..d975b263f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-12-06  David A. Capello  <dacap@users.sourceforge.net>
 
+	* src/widgets/editor/editor.c (editor_draw_sprite): Fixed to allow
+	differents indexed images in multiple editors in a screen
+	color-depth > 8bpp.
+
 	* src/util/misc.c (interactive_move_layer): Fixed problem with
 	scroll in windowed moded and mouse-paint problem in
 	double-buffering mode.
diff --git a/src/widgets/editor/editor.c b/src/widgets/editor/editor.c
index 4076294c6..534ca1b05 100644
--- a/src/widgets/editor/editor.c
+++ b/src/widgets/editor/editor.c
@@ -400,8 +400,17 @@ void editor_draw_sprite(JWidget widget, int x1, int y1, int x2, int y2)
       image_free(rendered);
       destroy_bitmap(bmp);
 #else
+
       use_current_sprite_rgb_map();
-      image_to_allegro(rendered, ji_screen, dest_x, dest_y);
+      if (bitmap_color_depth(screen) == 8) {
+	image_to_allegro(rendered, ji_screen, dest_x, dest_y);
+      }
+      else {
+	select_palette(sprite_get_palette(editor->sprite,
+					  editor->sprite->frame));
+	image_to_allegro(rendered, ji_screen, dest_x, dest_y);
+	unselect_palette();
+      }
       restore_rgb_map();
 
       image_free(rendered);