Upon leaving search, switch to dynamic bucket mode only if in Screen mode. Fixes #1139