513,515c513,516
<                 if (Boolean.TRUE.equals(getValue("active"))) {
<                     exitMode();
<                 }
---
>                 // Do not call exitMode here, cause it is donne by Main.map.selectMapMode(...) below
>                 //if (Boolean.TRUE.equals(getValue("active"))) {
>                 //    exitMode();
>                 //}