diff --git a/ChangeLog b/ChangeLog
index c0d338cf66..ed55562def 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-28  Sven Neumann  <sven@gimp.org>
+
+	* plug-ins/jpeg/jpeg-load.c (load_image): detach from the drawable.
+
 2005-04-28  Sven Neumann  <sven@gimp.org>
 
 	* app/core/gimptemplate.c (gimp_template_create_image): fill the
diff --git a/plug-ins/jpeg/jpeg-load.c b/plug-ins/jpeg/jpeg-load.c
index c81f4a7119..60531eea5a 100644
--- a/plug-ins/jpeg/jpeg-load.c
+++ b/plug-ins/jpeg/jpeg-load.c
@@ -455,10 +455,10 @@ load_image (const gchar *filename,
    * warnings occurred (test whether jerr.num_warnings is nonzero).
    */
 
-  /* Tell the GIMP to display the image.
+  /* Detach from the drawable and add it to the image.
    */
+  gimp_drawable_detach (drawable);
   gimp_image_add_layer (image_ID, layer_ID, 0);
-  gimp_drawable_flush (drawable);
 
   /* pw - Last of all, attach the parasites (couldn't do it earlier -
      there was no image. */