Proper fix for disabled module windows