diff --git a/res/layout/action_bar_custom_view.xml b/res/layout/action_bar_custom_view.xml
index c97adb8db..423b546bd 100644
--- a/res/layout/action_bar_custom_view.xml
+++ b/res/layout/action_bar_custom_view.xml
@@ -22,8 +22,7 @@
 
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="0dip"
-    android:layout_height="0dip"
+    style="@style/action_bar_custom_view"
     >
     <include
         android:id="@+id/account_spinner_container"
diff --git a/res/layout/action_bar_search.xml b/res/layout/action_bar_search.xml
index ec5801c07..e2cd96032 100644
--- a/res/layout/action_bar_search.xml
+++ b/res/layout/action_bar_search.xml
@@ -14,16 +14,11 @@
      limitations under the License.
 -->
 
-<FrameLayout
+<SearchView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/SearchBar"
-    android:orientation="horizontal"
-    >
-    <SearchView
-        android:id="@+id/search_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:iconifiedByDefault="false"
-        />
-</FrameLayout>
+    android:id="@+id/search_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:iconifiedByDefault="true"
+    />
diff --git a/res/layout/action_bar_spinner.xml b/res/layout/action_bar_spinner.xml
index cf13a48be..d2ffa43bb 100644
--- a/res/layout/action_bar_spinner.xml
+++ b/res/layout/action_bar_spinner.xml
@@ -16,7 +16,8 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/action_bar_spinner"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="horizontal"
     >
     <RelativeLayout
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 41d4e2845..1b2aadfb7 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -116,16 +116,11 @@
         <item name="android:layout_alignParentRight">true</item>
     </style>
 
-    <style name="SearchBar">
+    <style name="action_bar_custom_view">
         <item name="android:layout_width">420dip</item>
         <item name="android:layout_height">match_parent</item>
     </style>
 
-    <style name="action_bar_spinner">
-        <item name="android:layout_width">350dip</item>
-        <item name="android:layout_height">match_parent</item>
-    </style>
-
     <style name="action_bar_spinner_primary_text">
         <item name="android:includeFontPadding">false</item>
         <item name="android:textSize">18sp</item>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5ac201e4b..65003c7e6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -127,7 +127,7 @@
         <item name="android:singleLine">true</item>
     </style>
 
-    <style name="SearchBar">
+    <style name="action_bar_custom_view">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
     </style>
@@ -170,11 +170,6 @@
         <item name="android:ellipsize">end</item>
     </style>
 
-    <style name="action_bar_spinner">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">match_parent</item>
-    </style>
-
     <style name="action_bar_spinner_primary_text">
         <item name="android:textSize">16sp</item>
         <item name="android:textColor">@color/text_primary_color</item>
diff --git a/src/com/android/email/activity/ActionBarController.java b/src/com/android/email/activity/ActionBarController.java
index 705ec196e..40112555e 100644
--- a/src/com/android/email/activity/ActionBarController.java
+++ b/src/com/android/email/activity/ActionBarController.java
@@ -206,13 +206,8 @@ public class ActionBarController {
         mActionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_CUSTOM);
 
         // Prepare the custom view
-        final LayoutInflater inflater = LayoutInflater.from(mContext);
-        mActionBarCustomView = (ViewGroup) inflater.inflate(R.layout.action_bar_custom_view, null);
-        final ActionBar.LayoutParams customViewLayout = new ActionBar.LayoutParams(
-                ActionBar.LayoutParams.WRAP_CONTENT,
-                ActionBar.LayoutParams.MATCH_PARENT);
-        customViewLayout.setMargins(0, 0, 0, 0);
-        mActionBar.setCustomView(mActionBarCustomView, customViewLayout);
+        mActionBar.setCustomView(R.layout.action_bar_custom_view);
+        mActionBarCustomView = (ViewGroup) mActionBar.getCustomView();
 
         // Account spinner
         mAccountSpinnerContainer =
@@ -244,6 +239,7 @@ public class ActionBarController {
             mSearchView = UiUtilities.getView(mSearchContainer, R.id.search_view);
             mSearchView.setSubmitButtonEnabled(false);
             mSearchView.setOnQueryTextListener(mOnQueryText);
+            mSearchView.onActionViewExpanded();
             mActionBarCustomView.addView(mSearchContainer);
         }
     }