diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 2bd7f7270b..65d3683be2 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1392,20 +1392,21 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 		for (Buffer * b = &buffer_; i == 0 || b != &buffer_;
 			b = theBufferList().next(b)) {
 
-			DocIterator dit = b->getParFromID(id);
-			if (dit.atEnd()) {
+			Cursor cur(*this);
+			cur.setCursor(b->getParFromID(id));
+			if (cur.atEnd()) {
 				LYXERR(Debug::INFO, "No matching paragraph found! [" << id << "].");
 				++i;
 				continue;
 			}
-			LYXERR(Debug::INFO, "Paragraph " << dit.paragraph().id()
+			LYXERR(Debug::INFO, "Paragraph " << cur.paragraph().id()
 				<< " found in buffer `"
 				<< b->absFileName() << "'.");
 
 			if (b == &buffer_) {
 				// Set the cursor
-				dit.pos() = pos;
-				setCursor(dit);
+				cur.pos() = pos;
+				mouseSetCursor(cur);
 				dr.screenUpdate(Update::Force | Update::FitCursor);
 			} else {
 				// Switch to other buffer view and resend cmd
diff --git a/status.21x b/status.21x
index 9f851b8417..488f6a18c0 100644
--- a/status.21x
+++ b/status.21x
@@ -149,6 +149,9 @@ What's new
 
 - Fix selection of Interlingua user interface (bug 9267).
 
+- Delete empty paragaphs as needed when navigating the document using
+  outline mode (bug 9479).
+
 
 * INTERNALS