diff --git a/lms/static/coffee/spec/calculator_spec.coffee b/lms/static/coffee/spec/calculator_spec.coffee
index 58d7c70790..e57bff4a54 100644
--- a/lms/static/coffee/spec/calculator_spec.coffee
+++ b/lms/static/coffee/spec/calculator_spec.coffee
@@ -33,16 +33,16 @@ describe 'Calculator', ->
   describe 'toggle', ->
     it 'toggle the calculator and focus the input', ->
       spyOn $.fn, 'focus'
-      @calculator.toggle()
+      @calculator.toggle(jQuery.Event("click"))
 
       expect($('li.calc-main')).toHaveClass('open')
       expect($('#calculator_wrapper #calculator_input').focus).toHaveBeenCalled()
 
     it 'toggle the close button on the calculator button', ->
-      @calculator.toggle()
+      @calculator.toggle(jQuery.Event("click"))
       expect($('.calc')).toHaveClass('closed')
 
-      @calculator.toggle()
+      @calculator.toggle(jQuery.Event("click"))
       expect($('.calc')).not.toHaveClass('closed')
 
   describe 'helpToggle', ->
diff --git a/lms/static/coffee/spec/courseware_spec.coffee b/lms/static/coffee/spec/courseware_spec.coffee
index 9d938c14e1..cc64536849 100644
--- a/lms/static/coffee/spec/courseware_spec.coffee
+++ b/lms/static/coffee/spec/courseware_spec.coffee
@@ -5,16 +5,6 @@ describe 'Courseware', ->
       Courseware.start()
       expect(window.Navigation).toHaveBeenCalled()
 
-    it 'create the calculator', ->
-      spyOn(window, 'Calculator')
-      Courseware.start()
-      expect(window.Calculator).toHaveBeenCalled()
-
-    it 'creates the FeedbackForm', ->
-      spyOn(window, 'FeedbackForm')
-      Courseware.start()
-      expect(window.FeedbackForm).toHaveBeenCalled()
-
     it 'binds the Logger', ->
       spyOn(Logger, 'bind')
       Courseware.start()
diff --git a/lms/static/coffee/src/calculator.coffee b/lms/static/coffee/src/calculator.coffee
index 2f9b8a1aa8..18e7fba4ec 100644
--- a/lms/static/coffee/src/calculator.coffee
+++ b/lms/static/coffee/src/calculator.coffee
@@ -6,7 +6,8 @@ class @Calculator
     $('div.help-wrapper a').hover(@helpToggle).click (e) ->
       e.preventDefault()
 
-  toggle: ->
+  toggle: (event) ->
+    event.preventDefault()
     $('li.calc-main').toggleClass 'open'
     $('#calculator_wrapper #calculator_input').focus()
     if $('.calc.closed').length
diff --git a/lms/static/coffee/src/courseware.coffee b/lms/static/coffee/src/courseware.coffee
index e110dfe0ac..de232e05e4 100644
--- a/lms/static/coffee/src/courseware.coffee
+++ b/lms/static/coffee/src/courseware.coffee
@@ -4,8 +4,6 @@ class @Courseware
   constructor: ->
     Courseware.prefix = $("meta[name='path_prefix']").attr('content')
     new Navigation
-    new Calculator
-    new FeedbackForm
     Logger.bind()
     @bind()
     @render()
diff --git a/lms/static/coffee/src/main.coffee b/lms/static/coffee/src/main.coffee
index ccccb540c9..d1ba7e9dcf 100644
--- a/lms/static/coffee/src/main.coffee
+++ b/lms/static/coffee/src/main.coffee
@@ -17,6 +17,8 @@ $ ->
   # $("a[rel*=leanModal]").leanModal()
   $('#csrfmiddlewaretoken').attr 'value', $.cookie('csrftoken')
 
+  new Calculator
+  new FeedbackForm
   if $('body').hasClass('courseware')
     Courseware.start()