[#1133] Switch from using enteredView to attached