diff --git a/core/core-editor.el b/core/core-editor.el
index ad1e11296..77abc29f5 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -238,7 +238,8 @@
   (setq sp-autowrap-region nil          ; let evil-surround handle this
         sp-highlight-pair-overlay nil
         sp-cancel-autoskip-on-backward-movement nil
-        sp-show-pair-delay 0)
+        sp-show-pair-delay 0
+        sp-max-pair-length 5)
 
   (smartparens-global-mode 1)
   (require 'smartparens-config)
diff --git a/modules/module-lua.el b/modules/module-lua.el
index 9d739ea20..fa12cc641 100644
--- a/modules/module-lua.el
+++ b/modules/module-lua.el
@@ -8,13 +8,17 @@
   (def-company-backend! lua-mode (lua yasnippet))
   (def-electric! lua-mode :words ("else" "end"))
   (def-repl! lua-mode doom/inf-lua)
+  (add-hook! lua-mode
+    (setq-local sp-max-pair-length 9))
   (sp-with-modes '(lua-mode)
     ;; disable defaults
     (sp-local-pair "if" nil :actions       :rem)
     (sp-local-pair "while" nil :actions    :rem)
     (sp-local-pair "function" nil :actions :rem)
+    (sp-local-pair "if "   " end")
     (sp-local-pair "then " " end")
     (sp-local-pair "do "   " end")
+    (sp-local-pair "if"    "end" :when '(("RET")) :post-handlers '(" |\n[i]"))
     (sp-local-pair "then"  "end" :when '(("RET")) :post-handlers '("||\n[i]"))
     (sp-local-pair "do"    "end" :when '(("RET")) :post-handlers '("||\n[i]"))
     ;; block functions