Clicking a dock icon moves the screen to wrong workspace

When I click dock icon of a previously launched app, I expect it to take me to the workspace in which the app resides. However, sometimes it moves to an empty workspace instead and I have to click the icon in the dock again to get to the correct workspace (or navigate by other means).

This happens when:

I have two applications open, each of them in its own workspace. I close the app in the first workspace which I'm currently in, so it becomes empty (this is important). Then I click the dock icon of the other app which resides in the second workspace. This moves the screen - to an empty workspace! (Or to a workspace that is not empty but is one more position to the right then the target workspace.) This does not happen if I have at least one open app in the first workspace, so that it isn't completely empty.

A 'layperson' explanation:

I close the first app, emptying the workspace. Since Freya doesn't like empty workspaces, it will get rid of it - but not while I'm still in it. When I click the dock icon of the other app, I'm moving to the other workspace, while the 'soon to be removed' workspace still exists. But as soon as I move out, Freya removes it, moving all the other workspaces on the right one position to the left to fill the hole. So, when I arrive at the workspace where my second app previously was, it is no longer there because it has moved.

An evidence for this is that this only happens if the second app to whose workspace I want to move into is on the RIGHT. Because workspaces on the RIGHT move TO THE LEFT to fill the empty space, no such problem occurs when the target workspace is on the left from my current workspace (those workspaces do not need to move in order to fill in the hole).