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 3fa823a36b9..aa675365aab 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
@@ -835,15 +835,18 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
 				//{
 				//	 ISystemViewElementAdapter nextAdapter = (ISystemViewElementAdapter)uniqueAdapters.nextElement();
 				adapter.addActions(ourMenu, selection, shell, ISystemContextMenuConstants.GROUP_ADAPTERS);
-				if (adapter instanceof AbstractSystemViewAdapter) {
-
-					AbstractSystemViewAdapter aVA = (AbstractSystemViewAdapter) adapter;
-					// add remote actions
-					aVA.addCommonRemoteActions(ourMenu, selection, shell, ISystemContextMenuConstants.GROUP_ADAPTERS);
-
-					// add dynamic menu popups
-					aVA.addDynamicPopupMenuActions(ourMenu, selection, shell, ISystemContextMenuConstants.GROUP_ADDITIONS);
-				}
+				
+			     if (adapter instanceof AbstractSystemViewAdapter)
+			     {
+		
+						AbstractSystemViewAdapter aVA = (AbstractSystemViewAdapter)adapter;
+						
+						// add dynamic menu popups
+						aVA.addDynamicPopupMenuActions(ourMenu, selection, shell,  ISystemContextMenuConstants.GROUP_ADDITIONS);
+						
+						// add remote actions
+						aVA.addCommonRemoteActions(ourMenu, selection, shell, ISystemContextMenuConstants.GROUP_ADAPTERS);
+			     }
 				//}
 			}
 	
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java
index 3fa823a36b9..aa675365aab 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java
@@ -835,15 +835,18 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
 				//{
 				//	 ISystemViewElementAdapter nextAdapter = (ISystemViewElementAdapter)uniqueAdapters.nextElement();
 				adapter.addActions(ourMenu, selection, shell, ISystemContextMenuConstants.GROUP_ADAPTERS);
-				if (adapter instanceof AbstractSystemViewAdapter) {
-
-					AbstractSystemViewAdapter aVA = (AbstractSystemViewAdapter) adapter;
-					// add remote actions
-					aVA.addCommonRemoteActions(ourMenu, selection, shell, ISystemContextMenuConstants.GROUP_ADAPTERS);
-
-					// add dynamic menu popups
-					aVA.addDynamicPopupMenuActions(ourMenu, selection, shell, ISystemContextMenuConstants.GROUP_ADDITIONS);
-				}
+				
+			     if (adapter instanceof AbstractSystemViewAdapter)
+			     {
+		
+						AbstractSystemViewAdapter aVA = (AbstractSystemViewAdapter)adapter;
+						
+						// add dynamic menu popups
+						aVA.addDynamicPopupMenuActions(ourMenu, selection, shell,  ISystemContextMenuConstants.GROUP_ADDITIONS);
+						
+						// add remote actions
+						aVA.addCommonRemoteActions(ourMenu, selection, shell, ISystemContextMenuConstants.GROUP_ADAPTERS);
+			     }
 				//}
 			}