was not looking at the current component type and was relying on the tok...

...en being correct
Previously we were relying on the Component meta type from the history token and it was incorrect if you moved from one component grid to another.