diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c0199f32c..43f3e7dfd 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-16  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org.el (org-hide-archived-subtrees): Don't jump to end of
+	subtree if the match was not in a headline.
+
 2010-02-15  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-agenda.el (org-agenda-align-tags): Avoid side effects on
diff --git a/lisp/org.el b/lisp/org.el
index f2373677d..93e63da44 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3597,8 +3597,9 @@ collapsed state."
     (let* ((re (concat ":" org-archive-tag ":")))
       (goto-char beg)
       (while (re-search-forward re end t)
-	(and (org-on-heading-p) (org-flag-subtree t))
-	(org-end-of-subtree t)))))
+	(when (org-on-heading-p)
+	  (org-flag-subtree t)
+	  (org-end-of-subtree t))))))
 
 (defun org-flag-subtree (flag)
   (save-excursion