non-window mode improvement