Resolve focus bug (refs #3689)