diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index d777ff6e7b..401c03f798 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -2127,6 +2127,7 @@ bool GuiView::closeWorkArea(GuiWorkArea * wa)
 bool GuiView::closeBuffer()
 {
 	GuiWorkArea * wa = currentMainWorkArea();
+	setCurrentWorkArea(wa);
 	Buffer & buf = wa->bufferView().buffer();
 	return wa && closeWorkArea(wa, !buf.parent());
 }