diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0e3bef0be..ebfb21200 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
 
 	* org.el (org-adapt-indentation): Slightly improve the docstring.
 	(org-occur): Sends an error when the user inputs an empty string.
+	(org-priority): Bugfix: the tag alignement should happen within
+	save-excursion.
 
 	* org-exp.el (org-export-as-org): Use file-source.org format
 	instead of file.org-source.
diff --git a/lisp/org.el b/lisp/org.el
index ad87dedc1..a1797ce97 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -10307,13 +10307,12 @@ ACTION can be `set', `up', `down', or a character."
 		(goto-char (match-end 2))
 		(insert " [#" news "]"))
 	    (goto-char (match-beginning 3))
-	    (insert "[#" news "] ")))))
-    (org-preserve-lc (org-set-tags nil 'align))
+	    (insert "[#" news "] "))))
+      (org-preserve-lc (org-set-tags nil 'align)))
     (if remove
 	(message "Priority removed")
       (message "Priority of current item set to %s" news))))
 
-
 (defun org-get-priority (s)
   "Find priority cookie and return priority."
   (save-match-data