[Bug 922618] Fix collection edit mode [r=amirn]
Merge pull request #12577 from EverythingMe/bugfix-collection-edit

[Bug 922618] Fix collection edit mode [r=amirn]