diff --git a/app/components/hook-switch.coffee b/app/components/hook-switch.coffee
index 196e35ec..18468089 100644
--- a/app/components/hook-switch.coffee
+++ b/app/components/hook-switch.coffee
@@ -7,6 +7,7 @@ HookSwitchComponent = Ember.Component.extend
   activeBinding: "hook.active"
 
   click: ->
+    @sendAction('onToggle')
     hook = @get('hook')
     hook.toggle().then( (->), =>
       @toggleProperty('hook.active')
diff --git a/app/components/hooks-list-item.coffee b/app/components/hooks-list-item.coffee
index 5298c717..f0f69e3e 100644
--- a/app/components/hooks-list-item.coffee
+++ b/app/components/hooks-list-item.coffee
@@ -13,6 +13,9 @@ HooksListItemComponent = Ember.Component.extend
       @set("showError", true)
 
     close: ->
+      @send('resetErrors')
+
+    resetErrors: ->
       @set("showError", false)
 
 `export default HooksListItemComponent`
diff --git a/app/templates/components/hooks-list-item.hbs b/app/templates/components/hooks-list-item.hbs
index 50dde162..91fa3d36 100644
--- a/app/templates/components/hooks-list-item.hbs
+++ b/app/templates/components/hooks-list-item.hbs
@@ -1,5 +1,5 @@
 <div class="profile-hooks columns">
-  {{hook-switch hook=hook onToggleError="handleToggleError"}}
+  {{hook-switch hook=hook onToggleError="handleToggleError" onToggle="resetErrors"}}
   {{!-- <button class="switch is-on"></button> --}}
   {{#if hook.isSaving}}
     <span class="sync-spinner sync-spinner--grey"><i></i><i></i><i></i></span>