KeygaurdSelectorView: FIX

Additional Fixes were needed to make this commit work, lets add them
now!