Fix 'Upload button tooltip doesn't disappear' #7461
 @jancborchardt please review my fix for the mentioned issue.