fix a small bug with modifier-only activation

See #1713 for details.

The second commit might be more controversial, so tell me if I’m overlooking something.