New Device: Prevent popup from disappearing

This fix works however the effect is still ugly. Working on a better,
longterm fix.