Improved action window handling