Resolves #186 by having entry remove on enter

This was not done as it relied on the parent panel being removed.