popup window + iterator fix

Change-Id: I78e5c20d55127656ad96f59bdf514a11cca48e2c