Fixed the damn two window bug

while preserving all the listeners intact.  you ahve no idea how PISSED and happy I am at teh same time.