View should stay there until another CommandView/CommandSearch is execute
Merge commit 'd2436df7f2dcfc5002f84dff06ab6e20e6cad527' into vani's_branch