diff --git a/res/layout/navigation_bar.xml b/res/layout/navigation_bar.xml
index 74d0d09..8528d8a 100644
--- a/res/layout/navigation_bar.xml
+++ b/res/layout/navigation_bar.xml
@@ -111,7 +111,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:maxWidth="300dip" />
+        android:maxWidth="300dip"
+        android:iconifiedByDefault="false" />
     />
 
 </LinearLayout>
diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java
index 45c3771..780d8ed 100644
--- a/src/com/android/contacts/activities/ActionBarAdapter.java
+++ b/src/com/android/contacts/activities/ActionBarAdapter.java
@@ -92,7 +92,6 @@
         mFilterIndicator = mNavigationBar.findViewById(R.id.filter_indicator);
         mSearchView = (SearchView) mNavigationBar.findViewById(R.id.search_view);
 
-        mSearchView.setIconifiedByDefault(false);
         mSearchView.setOnQueryChangeListener(this);
         mSearchView.setOnCloseListener(this);
         mSearchView.setOnQueryTextFocusChangeListener(this);
diff --git a/src/com/android/contacts/views/editor/ContactEditorFragment.java b/src/com/android/contacts/views/editor/ContactEditorFragment.java
index 732f982..668fd04 100644
--- a/src/com/android/contacts/views/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/views/editor/ContactEditorFragment.java
@@ -1215,6 +1215,10 @@
 
     @Override
     public void onAggregationSuggestionChange() {
+        if (!isAdded()) {
+            return;
+        }
+
         RawContactEditorView rawContactView =
                 (RawContactEditorView)getRawContactEditorView(mAggregationSuggestionsRawContactId);
         if (rawContactView == null) {