This commit is mostly a reminder to refactor the desktop popup creation, but it gives...