diff --git a/espuds.el b/espuds.el
index 915b7fd..627b0fb 100644
--- a/espuds.el
+++ b/espuds.el
@@ -279,8 +279,9 @@ The value of the face PROPERTY must be one of VALID-VALUES."
 (When "^I execute the action chain$"
   "Executes the action chain."
   (lambda ()
-    (execute-kbd-macro espuds-action-chain)
-    (setq espuds-chain-active nil)))
+    (unwind-protect
+        (execute-kbd-macro espuds-action-chain)
+      (setq espuds-chain-active nil))))
 
 (When "^I call \"\\(.+\\)\"$"
   "Call the provided COMMAND"