FIX: Quote popup broke in refactor