Move submenus into viewport correctly.

The fix in #116 apparently broke this.