Revert "Revert "Fix expanded on phone""

This reverts commit 3d619c3a6708652b4a563bc8a2fad6811ba6d7bd.