Must hit Escape twice from Map after adding marker

After adding a marker on the map, you must hit Escape key twice in order to return to game. This is quite annoying. This is not a new bug, it has been in several past versions.