Proposed UI fix for #755