This commit backports two fixes from #3360’s vast discovery.
Attach a file by drag & drop or click to upload
