Fixing #2178 by repopulating the org switcher menu each time it's opened.