diff --git a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/ConfigurationView.java b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/ConfigurationView.java
index cd23ff0..d916412 100644
--- a/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/ConfigurationView.java
+++ b/update/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/views/ConfigurationView.java
@@ -14,6 +14,7 @@
 import org.eclipse.jface.viewers.*;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.*;
 import org.eclipse.ui.dialogs.PropertyDialogAction;
 import org.eclipse.ui.help.WorkbenchHelp;
@@ -916,12 +917,14 @@
 	}
 
 	private void asyncRefresh() {
-		Control control = viewer.getControl();
-		if (control.isDisposed())
+		Display display = SWTUtil.getStandardDisplay();
+		if (display==null) return;
+		if (viewer.getControl().isDisposed())
 			return;
-		control.getDisplay().asyncExec(new Runnable() {
+		display.asyncExec(new Runnable() {
 			public void run() {
-				viewer.refresh();
+				if (!viewer.getControl().isDisposed())
+					viewer.refresh();
 			}
 		});
 	}