diff --git a/modules/behavior/add_way.js b/modules/behavior/add_way.js
index 9479ca8da74..dbb22c6cc13 100644
--- a/modules/behavior/add_way.js
+++ b/modules/behavior/add_way.js
@@ -25,14 +25,11 @@ export function behaviorAddWay(context) {
 
     behavior.off = function(surface) {
         surface.call(draw.off);
+        context.map().dblclickZoomEnable(true);
     };
 
 
     behavior.cancel = function() {
-        window.setTimeout(function() {
-            context.map().dblclickZoomEnable(true);
-        }, 1000);
-
         context.enter(modeBrowse(context));
     };