Patch for Select closing issue