diff --git a/contrapunctus/cp-org.el b/contrapunctus/cp-org.el
index 818474d..c7d2e93 100644
--- a/contrapunctus/cp-org.el
+++ b/contrapunctus/cp-org.el
@@ -235,10 +235,12 @@ BUG - improper behaviour with checkboxes.
   (interactive)
   (let ((all-tags (org-get-buffer-tags))
         (current-tags (org-get-tags)))
-    (org-set-tags
-     (completing-read-multiple
-      "Tag: " all-tags nil 'confirm current-tags
-      'org-tags-history))))
+    (save-excursion
+      (org-back-to-heading)
+      (org-set-tags
+       (completing-read-multiple
+        "Tag: " all-tags nil 'confirm current-tags
+        'org-tags-history)))))
 
 (use-package org-indent
   :hook (org-mode . org-indent-mode))