[CDF-279] - Focus Window fixes

@diogofscmariano please review.