Fixed a duplicated code error from the last rebase
Fixed a duplicated code error from the last rebase

quoideneuf/pop-up-archive,quoideneuf/pop-up-archive,quoideneuf/pop-up-archive,quoideneuf/pop-up-archive