Change spacebar handler to properly reset options