*** empty log message ***
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/help/ContextHelpWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/help/ContextHelpWizard.java
index 9d34cc6..19b120b 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/help/ContextHelpWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/help/ContextHelpWizard.java
@@ -93,6 +93,7 @@
 			try {
 				manager.disconnect(fContexts[i].getFullPath(), monitor);
 				dc++;
+				fContexts[i] = null;
 			} catch (CoreException e) {
 				PDEPlugin.log(e);
 			}
@@ -133,6 +134,11 @@
 		return super.performCancel();
 	}
 	
+	public void dispose() {
+		cleanupBuffers();
+		super.dispose();
+	}
+	
 	public void addPages() {
 		loadContexts();
 		addPage(new ContextHelpWizardPage(fModels));