Hotfix popup jumping 4583

Some additional code for the fix