[TIMOB-8367] (3_1_X) UI Fix

Backport of PR #113

Fixes [TIMOB-8367](https://jira.appcelerator.org/browse/TIMOB-8367)