diff --git a/doc/org.texi b/doc/org.texi
index cd262020b..9684fd7aa 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -1,3 +1,4 @@
+
 \input texinfo
 @c %**start of header
 @setfilename ../../info/org
@@ -881,6 +882,9 @@ exposed by a sparse tree command (@pxref{Sparse trees}) or an agenda command
 (@pxref{Agenda commands}).  With a prefix argument show, on each
 level, all sibling headings.  With double prefix arg, also show the entire
 subtree of the parent.
+@kindex C-c C-k
+@item C-c C-k
+Expose all the headings of the subtree, CONTENT view for just one subtree.
 @kindex C-c C-x b
 @item C-c C-x b
 Show the current subtree in an indirect buffer@footnote{The indirect
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f65c5ca4e..cbc1e70f6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-20  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org.el (org-kill-note-or-show-branches): Hide subtree before
+	exposing the headings.
+
 2010-05-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.el (org-add-planning-info): Remove the empty line also
diff --git a/lisp/org.el b/lisp/org.el
index 0615c842c..83d11c3fd 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -16764,7 +16764,9 @@ Also updates the keyword regular expressions."
   "If this is a Note buffer, abort storing the note.  Else call `show-branches'."
   (interactive)
   (if (not org-finish-function)
-      (call-interactively 'show-branches)
+      (progn
+	(hide-subtree)
+	(call-interactively 'show-branches))
     (let ((org-note-abort t))
       (funcall org-finish-function))))