Fixes #1835
Merge pull request #1836 from state-hiu/fix_1835

Hides Edit Layer, Fixes #1835