fix for layout flashing issue

Signed-off-by: Adam McNicol <adamsorders@mac.com>
Commit from Upstream Repository