diff --git a/core/siren-core-utils.el b/core/siren-core-utils.el
index 612e885..9dea85f 100644
--- a/core/siren-core-utils.el
+++ b/core/siren-core-utils.el
@@ -33,12 +33,6 @@ Position the cursor at it's beginning, according to the current mode."
   (forward-line -1)
   (indent-according-to-mode))
 
-(defun siren-wrap-with (s)
-  "Create a wrapper function for smartparens using S."
-  `(lambda (&optional arg)
-     (interactive "P")
-     (sp-wrap-with-pair ,s)))
-
 (defun siren-align-region-to-equals (begin end)
   "Align region (specified with BEGIN and END) to equal signs."
   (interactive "r")
diff --git a/modules/languages/siren-lisp.el b/modules/languages/siren-lisp.el
index 65fd960..4f22e92 100644
--- a/modules/languages/siren-lisp.el
+++ b/modules/languages/siren-lisp.el
@@ -6,6 +6,8 @@
 
 ;;; Code:
 
+(require 'siren-smartparens)
+
 ;; Lisp configuration
 (define-key read-expression-map (kbd "TAB") 'completion-at-point)
 
diff --git a/modules/languages/siren-markdown.el b/modules/languages/siren-markdown.el
index 84c4224..ec81e95 100644
--- a/modules/languages/siren-markdown.el
+++ b/modules/languages/siren-markdown.el
@@ -10,7 +10,6 @@
 (require 'siren-display-line-numbers)
 (require 'siren-flyspell)
 (require 'siren-move-dup)
-(require 'siren-smartparens)
 
 (use-package markdown-mode
   :mode
@@ -50,8 +49,7 @@
     (siren-display-fill-column t)
     (siren-display-line-numbers t)
     (auto-fill-mode t)
-    (flyspell-mode t)
-    (smartparens-mode t))
+    (flyspell-mode t))
 
   (defun siren-markdown-mode-setup-prettier ()
     "Configure prettier-js-args based on auto-fill-column mode."
diff --git a/modules/org-mode/siren-org-mode.el b/modules/org-mode/siren-org-mode.el
index 6ab8fef..80f8da8 100644
--- a/modules/org-mode/siren-org-mode.el
+++ b/modules/org-mode/siren-org-mode.el
@@ -11,7 +11,6 @@
 (require 'siren-display-line-numbers)
 (require 'siren-flyspell)
 (require 'siren-smart-shift)
-(require 'siren-smartparens)
 
 (use-package org
   :straight (:type built-in)
@@ -93,7 +92,6 @@
     (siren-display-indentation t)
     (siren-display-line-numbers t)
     (flyspell-mode t)
-    (smartparens-mode t)
     (visual-line-mode t)
     (whitespace-mode t))
 
diff --git a/modules/text-editing/siren-smartparens.el b/modules/text-editing/siren-smartparens.el
index 2ada12c..f933af5 100644
--- a/modules/text-editing/siren-smartparens.el
+++ b/modules/text-editing/siren-smartparens.el
@@ -28,7 +28,10 @@
             "M-R" 'sp-rewrap-sexp)
 
   :hook
-  (prog-mode . smartparens-mode)
+  ((git-commit-setup
+    markdown-mode
+    org-mode
+    prog-mode) . siren-smartparens-mode-enable)
 
   :custom-face
   (sp-pair-overlay-face ((t (:inherit nil))))
@@ -38,6 +41,16 @@
   (sp-autoskip-closing-pair 'always)
   (sp-hybrid-kill-entire-symbol nil)
 
+  :preface
+  (defun siren-smartparens-mode-enable ()
+    (smartparens-mode t))
+
+  (defun siren-wrap-with (s)
+    "Create a wrapper function for smartparens using S."
+    `(lambda (&optional arg)
+       (interactive "P")
+       (sp-wrap-with-pair ,s)))
+
   :config
   ;; smart pairing for all
   (require 'smartparens-config)
diff --git a/modules/version-control/siren-magit.el b/modules/version-control/siren-magit.el
index 73afea5..fbe62a6 100644
--- a/modules/version-control/siren-magit.el
+++ b/modules/version-control/siren-magit.el
@@ -9,7 +9,6 @@
 (require 'siren-display-fill-column)
 (require 'siren-display-line-numbers)
 (require 'siren-flyspell)
-(require 'siren-smartparens)
 (require 'siren-whitespace)
 
 (use-package magit
@@ -57,7 +56,6 @@
     (siren-display-line-numbers)
     (auto-fill-mode t)
     (flyspell-mode t)
-    (smartparens-mode t)
     (whitespace-mode t))
 
   :config