Drop trailing space
Shell overlay support