Fix broken shell ui behavior (Click close)