Forgot to apply the same fix to companion window