diff --git a/cms/static/coffee/spec/views/upload_spec.coffee b/cms/static/coffee/spec/views/upload_spec.coffee
index 48d7d39429..e9c8234e61 100644
--- a/cms/static/coffee/spec/views/upload_spec.coffee
+++ b/cms/static/coffee/spec/views/upload_spec.coffee
@@ -15,8 +15,7 @@ define ["js/models/uploads", "js/views/uploads", "js/models/chapter", "common/js
 
         afterEach ->
             delete CMS.URL.UPLOAD_ASSET
-            if (@lastView && modal_helpers.isShowingModal(@lastView))
-                @lastView.hide()
+            modal_helpers.cancelModalIfShowing()
 
         createTestView = (test) ->
             view = new UploadDialog(
@@ -99,6 +98,7 @@ define ["js/models/uploads", "js/views/uploads", "js/models/chapter", "common/js
                 @clock = sinon.useFakeTimers()
 
             afterEach ->
+                modal_helpers.cancelModalIfShowing()
                 @clock.restore()
 
             it "can upload correctly", ->