Fix for mess after Double Click on a Item