Fix NPE on add to list

The previous commit caused a NPE when adding to lists
because I didn't properly consider the states the screen
could be in. Fixed.