Prevent Focus Loss When Skip Button is Pressed

Prevent Focus Loss When Skip Button is Pressed #540