Fix: show and dismiss was not always on main thread