diff --git a/src/re_frame/router.cljs b/src/re_frame/router.cljs
index b4f6186..0ebb35d 100644
--- a/src/re_frame/router.cljs
+++ b/src/re_frame/router.cljs
@@ -4,7 +4,8 @@
   (:require [reagent.core        :refer [flush]]
             [re-frame.handlers   :refer [handle]]
             [re-frame.utils      :refer [warn error]]
-            [cljs.core.async     :refer [chan put! <! timeout]]))
+            [cljs.core.async     :refer [chan put! <! timeout close!]]
+            [goog.async.nextTick]))
 
 ;; -- The Event Conveyor Belt  --------------------------------------------------------------------
 ;;
@@ -25,7 +26,7 @@
 ;; In a perpetual loop, read events from "event-chan", and call the right handler.
 ;;
 ;; Because handlers occupy the CPU, before each event is handled, hand
-;; back control to the browser, via a (<! (timeout 0)) call.
+;; back control to the browser, via a (<! (yield)) call.
 ;;
 ;; In some cases, we need to pause for an entire animationFrame, to ensure that
 ;; the DOM is fully flushed, before then calling a handler known to hog the CPU
@@ -34,13 +35,22 @@
 ;;   (dispatch ^:flush-dom  [:event-id other params])
 ;;
 
+(defn yield
+  "Yields control to the browser. Faster than (timeout 0).
+  See http://dev.clojure.org/jira/browse/ASYNC-137"
+  []
+  (let [ch (chan)]
+    (goog.async.nextTick #(close! ch))
+    ch))
+
+
 (defn router-loop
   []
   (go-loop []
            (let [event-v  (<! event-chan)                   ;; wait for an event
                  _        (if (:flush-dom (meta event-v))   ;; check the event for metadata
                             (do (flush) (<! (timeout 20)))  ;; wait just over one annimation frame (16ms), to rensure all pending GUI work is flushed to the DOM.
-                            (<! (timeout 0)))]              ;; just in case we are handling one dispatch after an other, give the browser back control to do its stuff
+                            (<! (yield)))]              ;; just in case we are handling one dispatch after an other, give the browser back control to do its stuff
              (try
                (handle event-v)