Fixing message clear/refocus issue