diff --git a/rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.xml b/rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.xml
index 33f6e1d8720..146a0b53ab5 100644
--- a/rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.xml
@@ -34,12 +34,11 @@ Contributors:
    </extension>
    
    <!-- remote eclipse filesystem not properly supported yet-->
+   <!--
       <extension
-         point="org.eclipse.rse.ui.popupMenus">
+         point="org.eclipse.ui.popupMenus">
       <objectContribution  
       		adaptable="false" 
-            subsystemconfigurationCategory="files"
-   			typefilter="folder"
    			id="org.eclipse.rse.eclipse.filesystem.createproject.">
             <visibility> 
                 <objectClass name="org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile"/>   
@@ -55,5 +54,26 @@ Contributors:
          </action>
        </objectContribution>
       </extension>
+      -->
+      
+      <extension point="org.eclipse.ui.popupMenus">
+	      <objectContribution
+            objectClass="org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile"
+            id="org.eclipse.rse.eclipse.filesystem.createproject.">
+                <visibility> 
+                	<objectState name="isdirectory" value="true"/>                  
+            </visibility>
+         <action
+               label="Create Remote Project"
+                tooltip="%ImportToProject.tooltip"
+               class="org.eclipse.rse.eclipse.filesystem.ui.actions.CreateRemoteProjectActionDelegate"
+               menubarPath="group.importexport"
+               enablesFor="1"
+               id="importToProject">
+         </action>
+      </objectContribution>
+      </extension>
+      
+      
  <!--  -->     
 </plugin>
diff --git a/rse/plugins/org.eclipse.rse.shells.ui/plugin.xml b/rse/plugins/org.eclipse.rse.shells.ui/plugin.xml
index 0a6f050b678..c3e05792af7 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.shells.ui/plugin.xml
@@ -69,16 +69,12 @@ Contributors:
    
    
   <extension
-         point="org.eclipse.rse.ui.popupMenus">
+         point="org.eclipse.ui.popupMenus">
       <objectContribution  
-      		adaptable="false" 
-      		typecategoryfilter="files"
+      		objectClass="org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile"
    			id="org.eclipse.rse.shells.ui.launch">
             <visibility> 
-            	<and>
-		            <objectClass name="org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile"/>
                 	<objectState name="isdirectory" value="true"/>   
-                </and> 
             </visibility>
          <action
                label="%Launch_Shell"