diff --git a/eclipse/common/plugins/com.liferay.ide.eclipse.project.core/src/com/liferay/ide/eclipse/project/core/util/ProjectUtil.java b/eclipse/common/plugins/com.liferay.ide.eclipse.project.core/src/com/liferay/ide/eclipse/project/core/util/ProjectUtil.java
index 78b8002202..3eddba7888 100644
--- a/eclipse/common/plugins/com.liferay.ide.eclipse.project.core/src/com/liferay/ide/eclipse/project/core/util/ProjectUtil.java
+++ b/eclipse/common/plugins/com.liferay.ide.eclipse.project.core/src/com/liferay/ide/eclipse/project/core/util/ProjectUtil.java
@@ -724,6 +724,11 @@ public static boolean isLiferayPluginType(String type) {
 				ISDKConstants.LAYOUTTPL_PLUGIN_PROJECT_SUFFIX.endsWith(type) || ISDKConstants.THEME_PLUGIN_PROJECT_SUFFIX.endsWith(type));
 	}
 
+	public static boolean isLiferayProject( IFolder folder ) {
+		return folder != null && folder.exists() && folder.getRawLocation() != null &&
+			isLiferayProjectDir( folder.getRawLocation().toFile() );
+	}
+
 	public static boolean isLiferayProject(IProject project) {
 		boolean retval = false;
 
@@ -805,6 +810,14 @@ public static boolean isPortletProject(IProject project) {
 		return hasFacet(project, IPluginFacetConstants.LIFERAY_PORTLET_PROJECT_FACET);
 	}
 
+	public static boolean isSDKProject( IProject project ) {
+		if (project == null || (!project.exists()) || (!project.isAccessible())) {
+			return false;
+		}
+		
+		return SDKUtil.isValidSDKLocation( project.getLocation().toOSString() );
+	}
+
 	public static boolean isThemeProject(IProject project) {
 		return hasFacet(project, IPluginFacetConstants.LIFERAY_THEME_FACET_ID);
 	}
diff --git a/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/plugin.xml b/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/plugin.xml
index 5309806f46..1d1d670c0c 100644
--- a/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/plugin.xml
+++ b/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/plugin.xml
@@ -76,6 +76,13 @@
             properties="isLiferayProject"
             type="org.eclipse.core.resources.IProject">
       </propertyTester>
+      <propertyTester
+            class="com.liferay.ide.eclipse.project.ui.SDKProjectPropertyTester"
+            id="com.liferay.ide.eclipse.project.ui.isSDKProject"
+            namespace="com.liferay.ide.eclipse.project.ui"
+            properties="isSDKProject"
+            type="org.eclipse.core.resources.IProject">
+      </propertyTester>
       <propertyTester
             class="com.liferay.ide.eclipse.project.ui.ProjectNaturePropertyTester"
             id="com.liferay.ide.eclipse.project.ui.hasNature"
@@ -90,6 +97,13 @@
             properties="isServiceFile"
             type="org.eclipse.core.resources.IFile">
       </propertyTester>
+      <propertyTester
+            class="com.liferay.ide.eclipse.project.ui.LiferayProjectPropertyTester"
+            id="com.liferay.ide.eclipse.project.ui.isLiferayProjectFolder"
+            namespace="com.liferay.ide.eclipse.project.ui"
+            properties="isLiferayProjectFolder"
+            type="org.eclipse.core.resources.IFolder">
+      </propertyTester>
    </extension>
    <extension
          point="org.eclipse.ui.keywords">
@@ -127,7 +141,7 @@
    </extension>
    <extension
          point="org.eclipse.ui.popupMenus">
-      <objectContribution objectClass="org.eclipse.core.resources.IProject" adaptable="true" id="com.liferay.ide.eclipse.ui.popupmenu">
+      <objectContribution objectClass="org.eclipse.core.resources.IResource" adaptable="true" id="com.liferay.ide.eclipse.ui.popupmenu">
          <menu
                icon="icons/e16/liferay.png"
                id="liferayPopupMenuCategory"
@@ -208,6 +222,43 @@
          </enablement>
          
       </objectContribution>
+      <objectContribution
+            adaptable="true"
+            id="com.liferay.ide.eclipse.project.ui.importSDKProjects"
+            objectClass="org.eclipse.core.resources.IProject">
+         <action
+               class="com.liferay.ide.eclipse.project.ui.action.SDKProjectsImportAction"
+               enablesFor="1"
+               icon="icons/e16/import.png"
+               id="com.liferay.ide.eclipse.project.ui.sdk.projects.import"
+               label="Import Liferay Projects..."
+               menubarPath="liferayPopupMenuCategory/slot1">
+         </action>
+         <enablement>
+         	<adapt type="org.eclipse.core.resources.IProject">
+         		<test
+					property="com.liferay.ide.eclipse.project.ui.isSDKProject" />
+         	</adapt>
+         </enablement>
+      </objectContribution>
+      <objectContribution
+            adaptable="true"
+            id="com.liferay.ide.eclipse.project.ui.existingLiferayProject"
+            objectClass="org.eclipse.core.resources.IFolder">
+         <action
+               class="com.liferay.ide.eclipse.project.ui.action.ImportLiferayProjectAction"
+               enablesFor="1"
+               icon="icons/e16/import.png"
+               id="com.liferay.ide.eclipse.project.ui.import.liferay.project"
+               label="Import Liferay Project..."
+               menubarPath="liferayPopupMenuCategory/slot1">
+         </action>
+         <enablement>
+           <adapt type="org.eclipse.core.resources.IFolder">
+             <test property="com.liferay.ide.eclipse.project.ui.isLiferayProjectFolder" />
+           </adapt>
+         </enablement>
+      </objectContribution>
       
    </extension>
    <extension
diff --git a/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/LiferayProjectPropertyTester.java b/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/LiferayProjectPropertyTester.java
index 6659c73a55..b257f84abf 100644
--- a/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/LiferayProjectPropertyTester.java
+++ b/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/LiferayProjectPropertyTester.java
@@ -18,6 +18,7 @@
 import com.liferay.ide.eclipse.project.core.util.ProjectUtil;
 
 import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 
 /**
@@ -29,6 +30,9 @@ public boolean test(Object receiver, String property, Object[] args, Object expe
 		if (receiver instanceof IProject) {
 			return ProjectUtil.isLiferayProject((IProject) receiver);
 		}
+		else if ( receiver instanceof IFolder ) {
+			return ProjectUtil.isLiferayProject( (IFolder) receiver );
+		}
 		
 		return false;
 	}
diff --git a/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/SDKProjectPropertyTester.java b/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/SDKProjectPropertyTester.java
new file mode 100644
index 0000000000..71b402e5c1
--- /dev/null
+++ b/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/SDKProjectPropertyTester.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2000-2011 Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ *******************************************************************************/
+
+package com.liferay.ide.eclipse.project.ui;
+
+import com.liferay.ide.eclipse.project.core.util.ProjectUtil;
+
+import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.core.resources.IProject;
+
+/**
+ * @author Greg Amerson
+ */
+public class SDKProjectPropertyTester extends PropertyTester {
+
+	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
+		if (receiver instanceof IProject) {
+			return ProjectUtil.isSDKProject( (IProject) receiver );
+		}
+		
+		return false;
+	}
+
+}
diff --git a/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/action/ImportLiferayProjectAction.java b/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/action/ImportLiferayProjectAction.java
new file mode 100644
index 0000000000..4c92da0953
--- /dev/null
+++ b/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/action/ImportLiferayProjectAction.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2000-2011 Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ *******************************************************************************/
+
+package com.liferay.ide.eclipse.project.ui.action;
+
+import com.liferay.ide.eclipse.project.ui.wizard.LiferayProjectImportWizard;
+
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IWorkbenchPart;
+
+/**
+ * @author Greg Amerson
+ */
+public class ImportLiferayProjectAction implements IObjectActionDelegate {
+
+	private ISelection fSelection;
+
+	public ImportLiferayProjectAction() {
+	}
+
+	public Display getDisplay() {
+		Display display = Display.getCurrent();
+		
+		if (display == null)
+			display = Display.getDefault();
+		
+		return display;
+	}
+
+	public void run(IAction action) {
+
+		if (fSelection instanceof IStructuredSelection) {
+			Object[] elems = ((IStructuredSelection) fSelection).toArray();
+			
+			IFolder folder = null;
+			
+			Object elem = elems[0];
+
+			if ( elem instanceof IFolder ) {
+				folder = (IFolder) elem;
+			}
+
+			LiferayProjectImportWizard wizard = new LiferayProjectImportWizard( folder );
+
+			final Display display = getDisplay();
+			
+			final WizardDialog dialog = new WizardDialog(display.getActiveShell(), wizard);
+			
+			BusyIndicator.showWhile(display, new Runnable() {
+
+				public void run() {
+					dialog.open();
+				}
+			});
+		}
+
+	}
+
+	public void selectionChanged(IAction action, ISelection selection) {
+		fSelection = selection;
+	}
+
+	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+	}
+
+}
diff --git a/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/action/SDKProjectsImportAction.java b/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/action/SDKProjectsImportAction.java
new file mode 100644
index 0000000000..5e2322e9b9
--- /dev/null
+++ b/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/action/SDKProjectsImportAction.java
@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * Copyright (c) 2000-2011 Liferay, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ *******************************************************************************/
+
+package com.liferay.ide.eclipse.project.ui.action;
+
+import com.liferay.ide.eclipse.project.ui.wizard.SDKProjectsImportWizard;
+import com.liferay.ide.eclipse.sdk.SDKManager;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IWorkbenchPart;
+
+/**
+ * @author Greg Amerson
+ */
+public class SDKProjectsImportAction implements IObjectActionDelegate {
+
+	private ISelection fSelection;
+
+	public SDKProjectsImportAction() {
+	}
+
+	public Display getDisplay() {
+		Display display = Display.getCurrent();
+		
+		if (display == null)
+			display = Display.getDefault();
+		
+		return display;
+	}
+
+	public void run(IAction action) {
+
+		if (fSelection instanceof IStructuredSelection) {
+			Object[] elems = ((IStructuredSelection) fSelection).toArray();
+			
+			IProject project = null;
+			
+			Object elem = elems[0];
+
+			if (elem instanceof IProject) {
+				project = (IProject) elem;
+			}
+
+			SDKProjectsImportWizard wizard =
+				new SDKProjectsImportWizard( SDKManager.getInstance().getSDK( project.getLocation() ) );
+
+			final Display display = getDisplay();
+			
+			final WizardDialog dialog = new WizardDialog(display.getActiveShell(), wizard);
+			
+			BusyIndicator.showWhile(display, new Runnable() {
+
+				public void run() {
+					dialog.open();
+				}
+			});
+		}
+
+	}
+
+	public void selectionChanged(IAction action, ISelection selection) {
+		fSelection = selection;
+	}
+
+	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+	}
+
+}
diff --git a/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/wizard/LiferayProjectImportWizard.java b/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/wizard/LiferayProjectImportWizard.java
index be176bcb58..b2e5e551e0 100644
--- a/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/wizard/LiferayProjectImportWizard.java
+++ b/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/wizard/LiferayProjectImportWizard.java
@@ -19,6 +19,7 @@
 import com.liferay.ide.eclipse.project.ui.ProjectUIPlugin;
 import com.liferay.ide.eclipse.ui.wizard.INewProjectWizard;
 
+import org.eclipse.core.resources.IFolder;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchWizard;
@@ -33,9 +34,10 @@
 public class LiferayProjectImportWizard extends DataModelWizard implements IWorkbenchWizard, INewProjectWizard {
 
 	protected LiferayProjectImportWizardPage liferayProjectImportWizardPage;
+	protected IFolder folder;
 
 	public LiferayProjectImportWizard() {
-		this(null);
+		this( (IDataModel) null );
 	}
 
 	public LiferayProjectImportWizard(IDataModel dataModel) {
@@ -47,6 +49,12 @@ public LiferayProjectImportWizard(IDataModel dataModel) {
 		setNeedsProgressMonitor(true);
 	}
 
+	public LiferayProjectImportWizard( IFolder folder ) {
+		this( (IDataModel) null );
+
+		this.folder = folder;
+	}
+
 	@Override
 	public boolean canFinish() {
 		return getDataModel().isValid();
@@ -57,8 +65,18 @@ public void init(IWorkbench workbench, IStructuredSelection selection) {
 
 	@Override
 	protected void doAddPages() {
+		if (folder != null) {
+			IDataModel model = getDataModel();
+			model.setProperty(
+				LiferayProjectImportDataModelProvider.PROJECT_LOCATION, folder.getRawLocation().toOSString() );
+
+		}
+		
 		liferayProjectImportWizardPage = new LiferayProjectImportWizardPage(getDataModel(), "pageOne", this);
-		liferayProjectImportWizardPage.setWizard(this);
+
+		if ( folder != null ) {
+			liferayProjectImportWizardPage.updateProjectRecord( folder.getRawLocation().toOSString() );
+		}
 		
 		addPage(liferayProjectImportWizardPage);
 	}
diff --git a/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/wizard/LiferayProjectImportWizardPage.java b/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/wizard/LiferayProjectImportWizardPage.java
index c715d10df5..2bd6e3db2e 100644
--- a/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/wizard/LiferayProjectImportWizardPage.java
+++ b/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/wizard/LiferayProjectImportWizardPage.java
@@ -217,7 +217,7 @@ protected void handleFileBrowseButton(final Text text) {
 		}
 	}
 
-	protected void updateProjectRecord(String projectLocation) {
+	protected void updateProjectRecord( String projectLocation ) {
 		if (CoreUtil.isNullOrEmpty(projectLocation)) {
 			return;
 		}
diff --git a/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/wizard/SDKProjectsImportWizard.java b/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/wizard/SDKProjectsImportWizard.java
index 4f5a30f530..37c45497aa 100644
--- a/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/wizard/SDKProjectsImportWizard.java
+++ b/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/wizard/SDKProjectsImportWizard.java
@@ -17,6 +17,7 @@
 
 import com.liferay.ide.eclipse.project.core.SDKProjectsImportDataModelProvider;
 import com.liferay.ide.eclipse.project.ui.ProjectUIPlugin;
+import com.liferay.ide.eclipse.sdk.SDK;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IWorkbench;
@@ -31,10 +32,12 @@
 @SuppressWarnings("restriction")
 public class SDKProjectsImportWizard extends DataModelWizard implements IWorkbenchWizard {
 
-	private SDKProjectsImportWizardPage sdkProjectsImportWizardPage;
+	protected SDKProjectsImportWizardPage sdkProjectsImportWizardPage;
+
+	protected SDK sdk;
 
 	public SDKProjectsImportWizard() {
-		this(null);
+		this( (IDataModel) null );
 	}
 
 	public SDKProjectsImportWizard(IDataModel dataModel) {
@@ -46,6 +49,12 @@ public SDKProjectsImportWizard(IDataModel dataModel) {
 			ProjectUIPlugin.PLUGIN_ID, "/icons/wizban/import_wiz.png"));
 	}
 
+	public SDKProjectsImportWizard( SDK sdk ) {
+		this( (IDataModel) null );
+
+		this.sdk = sdk;
+	}
+
 	@Override
 	public boolean canFinish() {
 		return getDataModel().isValid();
@@ -56,11 +65,17 @@ public void init(IWorkbench workbench, IStructuredSelection selection) {
 
 	@Override
 	protected void doAddPages() {
+		if ( sdk != null ) {
+			IDataModel model = getDataModel();
+			model.setStringProperty( SDKProjectsImportDataModelProvider.LIFERAY_SDK_NAME, sdk.getName() );
+		}
+
 		sdkProjectsImportWizardPage = new SDKProjectsImportWizardPage(getDataModel(), "pageOne");
-		
+
 		addPage(sdkProjectsImportWizardPage);
 	}
 
+
 	@Override
 	protected IDataModelProvider getDefaultProvider() {
 		return new SDKProjectsImportDataModelProvider();
@@ -71,4 +86,5 @@ protected boolean runForked() {
 		return false;
 	}
 
+
 }
diff --git a/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/wizard/SDKProjectsImportWizardPage.java b/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/wizard/SDKProjectsImportWizardPage.java
index dfd0ac4460..c9c062ff0b 100644
--- a/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/wizard/SDKProjectsImportWizardPage.java
+++ b/eclipse/common/plugins/com.liferay.ide.eclipse.project.ui/src/com/liferay/ide/eclipse/project/ui/wizard/SDKProjectsImportWizardPage.java
@@ -20,6 +20,8 @@
 import com.liferay.ide.eclipse.project.core.ProjectRecord;
 import com.liferay.ide.eclipse.project.core.util.ProjectUtil;
 import com.liferay.ide.eclipse.project.ui.ProjectUIPlugin;
+import com.liferay.ide.eclipse.sdk.SDK;
+import com.liferay.ide.eclipse.sdk.SDKManager;
 import com.liferay.ide.eclipse.ui.util.SWTUtil;
 
 import java.io.File;
@@ -545,6 +547,19 @@ protected Composite createTopLevelComposite(Composite parent) {
 		return topComposite;
 	}
 
+	@Override
+	protected void enter() {
+		String sdkName = getDataModel().getStringProperty( LIFERAY_SDK_NAME );
+
+		if ( sdkName != null ) {
+			SDK initialSdk = SDKManager.getInstance().getSDK( sdkName );
+
+			if ( initialSdk != null ) {
+				updateProjectsList( initialSdk.getLocation().toOSString() );
+			}
+		}
+	}
+
 	// @Override
 	// protected void enter() {
 	// super.enter();