diff --git a/core/java/com/android/internal/widget/ActionBarContextView.java b/core/java/com/android/internal/widget/ActionBarContextView.java
index bb0c752200926..71af115b52e23 100644
--- a/core/java/com/android/internal/widget/ActionBarContextView.java
+++ b/core/java/com/android/internal/widget/ActionBarContextView.java
@@ -278,18 +278,13 @@ public class ActionBarContextView extends ViewGroup implements AnimatorListener
             availableWidth = measureChildView(mClose, availableWidth, childSpecHeight, 0);
         }
 
-        if (mTitleLayout != null && mCustomView == null) {
-            availableWidth = measureChildView(mTitleLayout, availableWidth, childSpecHeight, 0);
+        if (mMenuView != null) {
+            availableWidth = measureChildView(mMenuView, availableWidth,
+                    childSpecHeight, 0);
         }
 
-        final int childCount = getChildCount();
-        for (int i = 0; i < childCount; i++) {
-            final View child = getChildAt(i);
-            if (child == mClose || child == mTitleLayout || child == mCustomView) {
-                continue;
-            }
-            
-            availableWidth = measureChildView(child, availableWidth, childSpecHeight, 0);
+        if (mTitleLayout != null && mCustomView == null) {
+            availableWidth = measureChildView(mTitleLayout, availableWidth, childSpecHeight, 0);
         }
 
         if (mCustomView != null) {
diff --git a/core/res/res/menu/webview_copy.xml b/core/res/res/menu/webview_copy.xml
index 41ad06a3f8ade..2761fec1487c0 100644
--- a/core/res/res/menu/webview_copy.xml
+++ b/core/res/res/menu/webview_copy.xml
@@ -18,26 +18,26 @@
     <item android:id="@+id/copy"
         android:icon="?android:attr/actionModeCopyDrawable"
         android:title="@string/copy"
-        android:showAsAction="always|withText"
+        android:showAsAction="ifRoom|withText"
         />
     <item android:id="@+id/share"
         android:icon="@drawable/ic_menu_share"
         android:title="@string/share"
-        android:showAsAction="always|withText"
+        android:showAsAction="ifRoom|withText"
         />
     <item android:id="@+id/select_all"
         android:title="@string/selectAll"
-        android:showAsAction="always|withText"
+        android:showAsAction="ifRoom|withText"
         />
     <item android:id="@+id/find"
         android:icon="@drawable/ic_menu_find"
         android:title="@string/find"
-        android:showAsAction="always|withText"
+        android:showAsAction="ifRoom|withText"
         />
     <item android:id="@+id/websearch"
         android:icon="@drawable/ic_menu_search"
         android:title="@string/websearch"
-        android:showAsAction="always|withText"
+        android:showAsAction="ifRoom|withText"
         />
 </menu>