[FIX] Toggle Edit Mode Fixes

:shipit: