diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index f9f84c1..66342fd 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -1336,7 +1336,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 		// FIXME: create a new method shared with LFUN_HELP_OPEN.
 		string const fname = to_utf8(cmd.argument());
 		//FIXME: current_view_
-		bool const create_view = d->views_.empty()
+		bool const create_view = (d->views_.empty() || !current_view_)
 			|| (!lyxrc.open_buffers_in_tabs
 			  && current_view_->documentBufferView() != 0);
 		if (create_view) {
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp