Receiving an error message while loading into a server doesn't properly return you to the Servers tab

Receiving an error message while loading into a server doesn't properly return you to the Servers tab.

Observed results:
You press the Join server button, loading screen appears saying locating server, error message appears, loading screen appears saying Loading resources, Returns you to the Locating server loading screen. You have to press Cancel in order to return to the Servers tab.

Expected results: 
You press the Join server button, loading screen appears saying locating server, error message appears, loading screen appears saying Loading resources, Returns you to the Servers tab.