Clicking command forwards previously entered query instead of latest state to command

[Sebobo]

Though this works correctly when executing the command via Enter