cleanup after fix for focus loss