Refined edit timeout checking