Fix bug where suggest button failed after returning from previous suggestion