Ajax Calls Generated for Entity Reference Views cause issues

Hi guys,
So the issue is this:
Entity Reference using views, to pull the NID of the editing node from the URL and use it as a contextual filter.
This is fine for one value, but as soon as the 'Remove' or 'Add an Item' buttons are clicked, all the dropdowns generated by the view are emptied.
This due to the fact that the Request URI seen by the view at this point is '/field_collection/ajax' not 'node/#/edit'
There needs to be an updated views handler for this scenario to return the correct NID to the view.

Cheers!
Chris