Fix Create Popup