     om/IDidUpdate
     (did-update [_ _ _]
       (timer/set-updating! owner (not (last-action-end-time container))))
-    om/IRender
-    (render [_]
+    om/IWillReceiveProps
+    (will-receive-props [this next-props]
+      (let [next-status (:status next-props)]
+        (if (and (= next-status :waiting)
+                 (not= status next-status))
+          (om/set-state! owner :override-status {:status status
+                                                 :until (+ (datetime/now)
+                                                           2000)})
+          (om/set-state! owner :override-status nil))))
+    om/IRenderState
+    (render-state [_ {:keys [override-status]}]
       (html
        (let [container-id (container-model/id container)
-             status (container-model/status container build-running?)
-             duration-ms (container-utilization-duration container)]
+             duration-ms (container-utilization-duration container)
+             status (maybe-override-status status override-status)
+             icon-name (case status
+                         :failed "Status-Failed"
+                         :success "Status-Passed"
+                         :canceled "Status-Canceled"
+                         :running "Status-Running"
+                         :waiting "Status-Queued"
+                         nil)]
          [:a.container-selector-v2
           {:on-click #(raise! owner [:container-selected {:container-id container-id}])
            :class (concat (container-model/status->classes status)

          [:span.upper-pill-section
           [:span.container-index (str (:index container))]
           [:span.status-icon
            (om/build container-result-icon {:name (case status
                                                     :failed "Status-Failed"
                                                     :success "Status-Passed"
                                                     :canceled "Status-Canceled"
                                                     :running "Status-Running"
                                                     :waiting "Status-Queued"
                                                     nil)})]]
          (om/build container-duration-label {:actions (:actions container)})])))))

(def paging-width 10)

                    (om/build container-pill-v2
                              {:container container
                               :build-running? build-running?
                               :current-container-id current-container-id
                               :status (container-model/status container build-running?)}
                              {:react-key (:index container)}))
                  (if (> subsequent-container-count 0)
                    [:a.container-selector-v2.page-container-pills
