diff --git a/Android.mk b/Android.mk
index ea1bbdb..f0fdce2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,7 +13,7 @@
 endif
 
 src_dirs := src $(contacts_common_dir)/src $(phone_common_dir)/src
-res_dirs := res $(contacts_common_dir)/res $(contacts_common_dir)/icons/res $(phone_common_dir)/res
+res_dirs := res res-aosp $(contacts_common_dir)/res $(contacts_common_dir)/icons/res $(phone_common_dir)/res
 asset_dirs := $(contacts_common_dir)/assets
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 54e8316..97a14aa 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -361,6 +361,8 @@
             android:name=".activities.CompactContactEditorActivity"
             android:label="@string/editContactActivityLabel"
             android:theme="@style/EditorActivityTheme"
+            android:excludeFromRecents="true"
+            android:taskAffinity=""
             android:windowSoftInputMode="stateHidden|adjustResize">
 
             <intent-filter android:label="@string/editContactDescription">
diff --git a/res/xml/shortcuts.xml b/res-aosp/xml/shortcuts.xml
similarity index 87%
rename from res/xml/shortcuts.xml
rename to res-aosp/xml/shortcuts.xml
index be96f9c..35d15e7 100644
--- a/res/xml/shortcuts.xml
+++ b/res-aosp/xml/shortcuts.xml
@@ -23,7 +23,7 @@
         <intent
             android:action="android.intent.action.INSERT"
             android:data="content://com.android.contacts/contacts"
-            android:targetClass="com.google.android.contacts.PeopleActivity" />
-        <categories android:name="android.shortcut.conversation"/>
+            android:targetPackage="com.android.contacts"
+            android:targetClass="com.android.contacts.activities.CompactContactEditorActivity"/>
     </shortcut>
 </shortcuts>