diff --git a/plug-ins/file-jpeg/jpeg-save.c b/plug-ins/file-jpeg/jpeg-save.c
index a5b835052a..0ee08ff9bf 100644
--- a/plug-ins/file-jpeg/jpeg-save.c
+++ b/plug-ins/file-jpeg/jpeg-save.c
@@ -743,7 +743,7 @@ make_preview (GimpProcedureConfig *config)
 
       g_object_unref (file);
 
-      if (! display)
+      if (separate_display)
         display = gimp_display_new (preview_image);
     }
   else
diff --git a/plug-ins/file-jpeg/jpeg.c b/plug-ins/file-jpeg/jpeg.c
index 478c497738..fcd1474cc7 100644
--- a/plug-ins/file-jpeg/jpeg.c
+++ b/plug-ins/file-jpeg/jpeg.c
@@ -85,6 +85,7 @@ GIMP_MAIN (JPEG_TYPE)
 
 gboolean         undo_touched      = FALSE;
 GimpDisplay     *display           = NULL;
+gboolean         separate_display  = FALSE;
 GimpImage       *orig_image_global = NULL;
 GimpDrawable    *drawable_global   = NULL;
 
@@ -470,6 +471,7 @@ jpeg_save (GimpProcedure        *procedure,
               }
 
             display = NULL;
+            separate_display = TRUE;
           }
           break;
 
diff --git a/plug-ins/file-jpeg/jpeg.h b/plug-ins/file-jpeg/jpeg.h
index 4b8a81d622..84171d846a 100644
--- a/plug-ins/file-jpeg/jpeg.h
+++ b/plug-ins/file-jpeg/jpeg.h
@@ -56,6 +56,7 @@ extern GimpLayer *      preview_layer;
 extern gboolean         undo_touched;
 extern gboolean         load_interactive;
 extern GimpDisplay     *display;
+extern gboolean         separate_display;
 
 
 void      destroy_preview               (void);