Client side: Fix prev commit (remove class in ESC event)