Actually fix the double dialog bug