fix for #456 (File->New faulty) part 2 [needs backport]

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@22857 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
fix for #456 (File->New faulty) part 3 [already backported]

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@22860 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e