Control defaults to using the default view
Merge pull request #1938 from ghempton/control-default-view

Control defaults to using the default view