Revert "Fix 'View menu' behavior (again)"

This reverts commit 0f47468d94d791df062021bab0ee0cf3dc4e6a12.
Revert "Revert "Fix 'View menu' behavior (again)""

This reverts commit 679fe450b92fad4fa4205c0c4af8e421db7926c4.