diff --git a/src/com/android/contacts/TabStripView.java b/src/com/android/contacts/TabStripView.java
index ae80be0..9b875d1 100644
--- a/src/com/android/contacts/TabStripView.java
+++ b/src/com/android/contacts/TabStripView.java
@@ -46,6 +46,7 @@
     }
 
     private void init() {
+        mGroupFlags |= FLAG_USE_CHILD_DRAWING_ORDER;
         mBottomLeftStrip = mContext.getResources().getDrawable(
                 R.drawable.tab_bottom);
         mBottomRightStrip = mContext.getResources().getDrawable(
@@ -68,6 +69,19 @@
     }
 
     @Override
+    protected int getChildDrawingOrder(int childCount, int i) {
+        // Always draw the selected tab last, so that drop shadows are drawn
+        // in the correct z-order.
+        if (i == childCount - 1) {
+            return mSelectedTabIndex;
+        } else if (i >= mSelectedTabIndex) {
+            return i + 1;
+        } else {
+            return i;
+        }
+    }
+
+    @Override
     public void childDrawableStateChanged(View child) {
         if (child == getChildAt(mSelectedTabIndex)) {
             // To make sure that the bottom strip is redrawn