Fix/custom settings tabs#1446

Seems to fix the immediate issue, but I'm not sure what other implications this change might have. Help and suggestions definitely welcome