Order popup fix