Gate off add photo using new button enabler

Fixes #716.