Fix bug #3565 by reverting “fix bug 3559, 'Opening preferences window causes out...