Try and robustify menu_launch_type a bit
    
    The mistypes on KDE are bugging me. Let's see if this - mainly
    the wait_screen_change, the other just seems like a logical
    tweak - helps at all.
    
    Signed-off-by: Adam Williamson <awilliam@redhat.com>