Fix popup final

hopefully this should finally fix #37

please test