diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 1ecc27b612..6f3d42ca8e 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -1722,8 +1722,10 @@ void GuiView::updateBufferDependent(bool switched) const
 
 	for(; it != end; ++it) {
 		Dialog * dialog = it->second.get();
+		if (!dialog->isVisibleView())
+			continue;
 		if (switched && dialog->isBufferDependent()) {
-			if (dialog->isVisibleView() && dialog->initialiseParams(""))
+			if (dialog->initialiseParams(""))
 				dialog->updateView();
 			else
 				dialog->hide();