diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
index fcb39699890..d2d32d98609 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
@@ -5962,11 +5962,13 @@ public class SystemView extends SafeTreeViewer
 				}
 			}
 			
-			SelectionChangedEvent dummyEvent = new SelectionChangedEvent(this, parentSelection);
+			
+			if (parentSelection != null){
+				SelectionChangedEvent dummyEvent = new SelectionChangedEvent(this, parentSelection);
+				// first change the selection, then change it back (otherwise the property sheet ignores the event)
+				fireSelectionChanged(dummyEvent);
+			}
 			SelectionChangedEvent event = new SelectionChangedEvent(this, selection);
-
-			// first change the selection, then change it back (otherwise the property sheet ignores the event)
-			fireSelectionChanged(dummyEvent);
 			
 			// fire the event
 			fireSelectionChanged(event);