Fix for window unwrenching noise

Fixes #3735