Resolve TODO: problem when reconnecting from navigation drawer