diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 07fdfe08e..f91824e3d 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -916,3 +916,13 @@ compelling reason, so..."
       (org-clock-load))
     :config
     (add-hook 'kill-emacs-hook #'org-clock-save)))
+
+  (use-package! helm-org
+    :if (featurep! :completion helm)
+    :defer t
+    :init
+    (progn
+      (add-to-list 'helm-completing-read-handlers-alist
+                   '(org-capture . helm-org-completing-read-tags))
+      (add-to-list 'helm-completing-read-handlers-alist
+                   '(org-set-tags . helm-org-completing-read-tags))))
diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el
index db46d566e..ec130f039 100644
--- a/modules/lang/org/packages.el
+++ b/modules/lang/org/packages.el
@@ -36,6 +36,8 @@
   (package! ob-rust))
 
 ;;; Modules
+(when (featurep! :completion helm)
+  (package! helm-org))
 (when (featurep! +dragndrop)
   (package! org-download))
 (when (featurep! +gnuplot)