fix the scroll bar on plugin submenu

Merging #3495 via this to fix whitespace issues

Fixes #3315 
Fixes #3495