Fix dnd tab reordering issue #8888

Merged

bsclifton merged 2 commits into master from dnd/8887

May 16, 2017