diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 97ed9d81fd..c246190c09 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -4427,6 +4427,8 @@ Buffer::ReadStatus Buffer::reload()
 	d->filename.refresh();
 	docstring const disp_fn = makeDisplayPath(d->filename.absFileName());
 
+	// clear parent. this will get reset if need be.
+	d->setParent(0);
 	ReadStatus const status = loadLyXFile();
 	if (status == ReadSuccess) {
 		updateBuffer();
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 3adc781b49..f339119dde 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -2292,7 +2292,10 @@ bool GuiView::renameBuffer(Buffer & b, docstring const & newname)
 		}
 	}
 
-	return saveBuffer(b, fname);
+	bool const saved = saveBuffer(b, fname);
+	if (saved)
+		b.reload();
+	return saved;
 }
 
 
diff --git a/status.20x b/status.20x
index d4414dcd02..158370e8dd 100644
--- a/status.20x
+++ b/status.20x
@@ -97,6 +97,8 @@ What's new
 
 - Fix crash when using undo in a paragraph with layout Bibliography (bug 7111).
 
+- Fix crash when renaming a child buffer.
+
 - Replace current selection when pasting (bug 8027).
 
 - Make sure that undo restores environment depth correctly (bug 8159).
@@ -108,7 +110,8 @@ What's new
 - Fix problem with configure.py when the user profile path on Windows
   contains non-ascii characters (bug 8254).
 
-- remove annoying startup debug message.
+- Remove annoying startup debug message.
+
 
 * DOCUMENTATION AND LOCALIZATION