Issue 3481 show add to bundle even with no environments set up

Fixes #3481 and #3482