This brings things closer to parity with the GWT UI. Bug: Issue 6057 Change-Id: I1be23a98bf406df9de1c56832bd2f553df351cdb