diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java
index 96712cf2f32..0d41c4f9464 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java
@@ -1518,6 +1518,10 @@ public abstract class AbstractSystemViewAdapter implements ISystemViewElementAda
 			}
 			return false;
 		}
+		else if (name.equalsIgnoreCase("isRemote"))
+		{
+			return isRemote(target);
+		}
 		
 		// Give the ISV's as the element owners/contibutors the chance to extend the standard RSE action
 		// filters for their specific needs. We do this by trying to determine the system type from the
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemViewElementAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemViewElementAdapter.java
index a1759414db3..9acef4e7015 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemViewElementAdapter.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/ISystemViewElementAdapter.java
@@ -240,6 +240,15 @@ public interface ISystemViewElementAdapter extends IPropertySource, ISystemDragD
      * sessions
      */
     public boolean isPromptable(Object element);	
+    
+    
+    /**
+     * Return true if this object is a "remote" object.  A remote object is defined as an object
+     * that is not part of the base RSE artifacts (hosts, subsystems, filters)
+     * @param element the object
+     * @return true if the object is remote
+     */
+    public boolean isRemote(Object element);
 		
 	/**
 	 * Set input object for property source queries. This is called by the
diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/teamview/SystemTeamViewCompileCommandAdapter.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/teamview/SystemTeamViewCompileCommandAdapter.java
index 9d8f0fe7c25..ede668aeac2 100644
--- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/teamview/SystemTeamViewCompileCommandAdapter.java
+++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/teamview/SystemTeamViewCompileCommandAdapter.java
@@ -197,4 +197,14 @@ public class SystemTeamViewCompileCommandAdapter extends AbstractSystemViewAdapt
 	 SystemTeamViewCompileTypeNode type = (SystemTeamViewCompileTypeNode)element;	
 	 return type.getProfile().getName() + "." + type.getParentCategory().getLabel() +"." + type.getParentSubSystemFactory().getName() + "." + type.getLabel(); 
 	 }*/
+	
+	/**
+	 * This is a local RSE artifact so returning false
+	 * 
+	 * @param element the object to check
+	 * @return false since this is not remote
+	 */
+	public boolean isRemote(Object element) {
+		return false;
+	}
 }
diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/teamview/SystemTeamViewCompileTypeAdapter.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/teamview/SystemTeamViewCompileTypeAdapter.java
index 1b6c0fd24fb..2a5079c662b 100644
--- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/teamview/SystemTeamViewCompileTypeAdapter.java
+++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/teamview/SystemTeamViewCompileTypeAdapter.java
@@ -188,4 +188,14 @@ public class SystemTeamViewCompileTypeAdapter extends AbstractSystemViewAdapter
 	 SystemTeamViewCompileTypeNode type = (SystemTeamViewCompileTypeNode)element;	
 	 return type.getProfile().getName() + "." + type.getParentCategory().getLabel() +"." + type.getParentSubSystemFactory().getName() + "." + type.getLabel(); 
 	 }*/
+	
+	/**
+	 * This is a local RSE artifact so returning false
+	 * 
+	 * @param element the object to check
+	 * @return false since this is not remote
+	 */
+	public boolean isRemote(Object element) {
+		return false;
+	}
 }
diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/teamview/SystemTeamViewUserActionAdapter.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/teamview/SystemTeamViewUserActionAdapter.java
index 4a4096cecc4..1a0fbc7791e 100644
--- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/teamview/SystemTeamViewUserActionAdapter.java
+++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/teamview/SystemTeamViewUserActionAdapter.java
@@ -210,4 +210,14 @@ public class SystemTeamViewUserActionAdapter extends AbstractSystemViewAdapter i
 	public String getMementoHandleKey(Object element) {
 		return null; // not needed now as we don't re-expand to this level	  
 	}
+	
+	/**
+	 * This is a local RSE artifact so returning false
+	 * 
+	 * @param element the object to check
+	 * @return false since this is not remote
+	 */
+	public boolean isRemote(Object element) {
+		return false;
+	}
 }