1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java
index bc0ec4cbe..ced347d45 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java
@@ -104,8 +104,10 @@ public class ImageMergeViewer extends ContentMergeViewer {
 					}
 				}
 
-				canvas.setImage(image);
 				if (image != null) {
+					Image nonNullImage = image;
+					canvas.setImage(nonNullImage);
+					canvas.addDisposeListener(e -> nonNullImage.dispose());
 					canvas.setBackground(display.getSystemColor(SWT.COLOR_LIST_BACKGROUND));
 				} else {
 					canvas.setBackground(null);