diff --git a/res/menu/activity_main_drawer.xml b/res/menu/activity_main_drawer.xml
index 75277af..4e58f44 100644
--- a/res/menu/activity_main_drawer.xml
+++ b/res/menu/activity_main_drawer.xml
@@ -41,14 +41,6 @@
         </item>
     </group>
 
-    <group android:id="@+id/create_groups">
-        <item
-            android:id="@+id/nav_create_groups"
-            android:icon="@drawable/ic_menu_group_add"
-            android:title="@string/menu_new_group_action_bar"
-            android:visible="false"/>
-    </group>
-
     <group android:id="@+id/filters">
         <item
             android:id="@+id/nav_filters"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 85b8898..dc95ba8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -874,8 +874,8 @@
     <!-- The menu item to open blocked numbers activity [CHAR LIMIT=60]-->
     <string name="menu_blocked_numbers">Blocked numbers</string>
 
-    <!-- The menu item to open the link/merge duplicates activity. [CHAR LIMIT=80]-->
-    <string name="menu_duplicates">Find duplicates</string>
+    <!-- The menu item to open the link/merge duplicates activity. [CHAR LIMIT=20]-->
+    <string name="menu_duplicates">Duplicates</string>
 
     <!-- Open drawer content descriptions [CHAR LIMIT=40] -->
     <string name="navigation_drawer_open">Open navigation drawer</string>
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index b692bde..1682957 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -925,7 +925,11 @@
             }
         }
 
-        makeMenuItemVisible(menu, R.id.nav_create_groups, areGroupWritableAccountsAvailable());
+        // Create a menu item in the sub menu to add new groups
+        final MenuItem menuItem = subMenu.add(R.id.nav_groups_items, Menu.NONE, Menu.NONE,
+                getString(R.string.menu_new_group_action_bar));
+        menuItem.setIntent(GroupUtil.createAddGroupIntent(this));
+        menuItem.setIcon(R.drawable.ic_menu_group_add);
     }
 
     @Override
@@ -1247,8 +1251,6 @@
         } else if (id == R.id.nav_find_duplicates) {
             ImplicitIntentsUtil.startActivityInAppIfPossible(this,
                     Assistants.getDuplicatesActivityIntent(this));
-        } else if (id == R.id.nav_create_groups) {
-            ImplicitIntentsUtil.startActivityInApp(this, GroupUtil.createAddGroupIntent(this));
         } else if (item.getIntent() != null) {
             ImplicitIntentsUtil.startActivityInApp(this, item.getIntent());
         } else {
