Added support for shell-pop