Fixing Issue Where Highlight Persisted With No Selection