diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewPart.java
index 0e6b63eb2f4..156c3e61dca 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewPart.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableViewPart.java
@@ -1236,14 +1236,12 @@ public class SystemTableViewPart extends ViewPart implements ISelectionListener,
 		boolean alreadyHandled = false;
 		if (adapter != null)
 		{
-			if (adapter.hasChildren(element))
+			alreadyHandled = adapter.handleDoubleClick(element);
+			
+			if (!alreadyHandled && adapter.hasChildren(element))
 			{
 				setInput((IAdaptable) element);
 			}
-			else
-			{
-				alreadyHandled = adapter.handleDoubleClick(element);
-			}
 		}
 	}