Update solution
Move close command into code-behind