diff --git a/+org.el b/+org.el
index ef2bfe7..eeb3edd 100644
--- a/+org.el
+++ b/+org.el
@@ -135,3 +135,12 @@
         org-noter-default-heading-title " "))
 ;; Increase the latex preview size
 (setq org-format-latex-options (plist-put org-format-latex-options :scale 3.0))
+;; Close tags automatically
+(after! smartparens
+  (sp-with-modes 'org-mode
+    (sp-local-pair "*" "*")
+    (sp-local-pair "_" "_")
+    (sp-local-pair "/" "/")
+    (sp-local-pair "~" "~")
+    (sp-local-pair "=" "=")
+    (sp-local-pair "$" "$")))