Stop nudge when exiting move mode (fixes #1766)
Suppress menu in more places