diff --git a/layers/+lang/autohotkey/packages.el b/layers/+lang/autohotkey/packages.el
index 5d4d36a72..c26d80c72 100644
--- a/layers/+lang/autohotkey/packages.el
+++ b/layers/+lang/autohotkey/packages.el
@@ -18,6 +18,9 @@
     :defer t
     :init
     (progn
+      ;; work-around for issue #21
+      ;; https://github.com/ralesi/ahk-mode/issues/21
+      (add-hook 'ahk-mode-hook 'spacemacs/run-prog-mode-hooks)
       (spacemacs/declare-prefix-for-mode 'ahk-mode "mc" "comment")
       (spacemacs/declare-prefix-for-mode 'ahk-mode "me" "eval")
       (spacemacs/declare-prefix-for-mode 'ahk-mode "mh" "help")