Fixed double click navigation