Improving a the odds for a race condition

Since a fix would be quite complicated and the part with the racecodition needs
user interaction, I only improve the odds of the condition happening. (Usually
users don't do two things at a time)