Task switching: attempts to open files before switching branch

Hi,

I want to confirm the following behavior and get a workaround, if possible:

1. Open project managed by git
2. Create two tasks, each task must have own branch
3. Create a file in the first task and commit; leave file window open
4. Switch to other task
5. Switch back to first task

After p.5 I observe the following:

1. PhpStorm re-opens windows for the first task
2. It tries to open file created in p.3 above, but fails
3. It does "git checkout" -- the file is now available, but no window is open

So, if file exists in one branch only, its window won't be restored upon task switching.

Can anyone confirm this behavior? Is there a workaround? Or maybe I'm doing something wrong?

Any help is appreciated.

Regards,
Alex