diff --git a/init.el b/init.el
index c08a5d4..736570c 100644
--- a/init.el
+++ b/init.el
@@ -335,7 +335,8 @@
               tab-width 4)
 
 ;; Enable indentation and completion using the TAB key
-(setq-default tab-always-indent nil)
+(setq tab-always-indent 'complete)
+(setq tab-first-completion 'word-or-paren-or-punct)
 
 ;; Perf: Reduce command completion overhead.
 (setq read-extended-command-predicate #'command-completion-default-include-p)