Fix #821: Un-full-screen doesn't work. Regression