Tighten patch for suppressing auto-close.
Start on fixing combo-box.