diff --git a/src/com/android/email/activity/ThreePaneLayout.java b/src/com/android/email/activity/ThreePaneLayout.java
index 4564494a8..a28b3c8a2 100644
--- a/src/com/android/email/activity/ThreePaneLayout.java
+++ b/src/com/android/email/activity/ThreePaneLayout.java
@@ -294,6 +294,9 @@ public class ThreePaneLayout extends LinearLayout implements View.OnClickListene
 
         if (mPaneState == STATE_RIGHT_VISIBLE) {
             return changePaneState(STATE_MIDDLE_EXPANDED, true);
+        } else if (mInitialPaneState == STATE_RIGHT_VISIBLE) {
+            mInitialPaneState = STATE_MIDDLE_EXPANDED;
+            return true;
         }
 
         return false;
diff --git a/src/com/android/email/activity/UIControllerTwoPane.java b/src/com/android/email/activity/UIControllerTwoPane.java
index 5940818fc..85a700d51 100644
--- a/src/com/android/email/activity/UIControllerTwoPane.java
+++ b/src/com/android/email/activity/UIControllerTwoPane.java
@@ -337,6 +337,7 @@ class UIControllerTwoPane extends UIControllerBase implements ThreePaneLayout.Ca
             mThreePane.showRightPane();
         } else if (mListContext.isSearch()) {
             mThreePane.showRightPane();
+            mThreePane.uncollapsePane();
         } else {
             mThreePane.showLeftPane();
         }