diff --git a/src/frontends/qt4/GuiToc.cpp b/src/frontends/qt4/GuiToc.cpp
index 24d072081b..f130f878c5 100644
--- a/src/frontends/qt4/GuiToc.cpp
+++ b/src/frontends/qt4/GuiToc.cpp
@@ -83,6 +83,7 @@ void GuiToc::dispatchParams()
 
 void GuiToc::enableView(bool enable)
 {
+	widget_->init(QString());
 	widget_->setEnabled(enable);
 }
 
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 2dbcfd5ef1..3ee10af27e 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -676,7 +676,7 @@ void GuiView::on_lastWorkAreaRemoved()
 		}
 	}
 #else
-	structureChanged();
+	d.toc_models_.reset(0);
 	// The document settings needs to be reinitialised.
 	updateDialog("document", "");
 	updateDialogs();
diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp
index d46a7d3a65..05501f16e9 100644
--- a/src/frontends/qt4/TocWidget.cpp
+++ b/src/frontends/qt4/TocWidget.cpp
@@ -21,6 +21,7 @@
 #include "LyXFunc.h"
 
 #include "support/debug.h"
+#include "support/lassert.h"
 
 #include <QHeaderView>
 #include <QTimer>
@@ -132,9 +133,9 @@ void TocWidget::setTreeDepth(int depth)
 }
 
 
-void TocWidget::on_typeCO_currentIndexChanged(int value)
+void TocWidget::on_typeCO_currentIndexChanged(int)
 {
-	setTocModel(value);
+	updateView();
 	gui_view_.setFocus();
 }
 
@@ -209,6 +210,7 @@ void TocWidget::enableControls(bool enable)
 void TocWidget::updateView()
 {
 	LYXERR(Debug::GUI, "In TocWidget::updateView()");
+	setTocModel();
 	setTreeDepth(depth_);
 	select(gui_view_.tocModels().currentIndex(typeCO->currentIndex()));
 }
@@ -219,12 +221,14 @@ void TocWidget::init(QString const & str)
 	QStringList const & type_names = gui_view_.tocModels().typeNames();
 	if (type_names.isEmpty()) {
 		enableControls(false);
-		typeCO->clear();
+		typeCO->setEnabled(false);
 		tocTV->setModel(new QStandardItemModel);
-		tocTV->setEditTriggers(QAbstractItemView::NoEditTriggers);
+		tocTV->setEnabled(false);
 		return;
 	}
 
+	typeCO->setEnabled(true);
+	tocTV->setEnabled(true);
 	int selected_type = gui_view_.tocModels().decodeType(str);
 
 	QString const current_text = typeCO->currentText();
@@ -244,36 +248,32 @@ void TocWidget::init(QString const & str)
 
 	typeCO->blockSignals(false);
 
-	setTocModel(typeCO->currentIndex());
-}
-
-
-void TocWidget::setTocModel(size_t type)
-{
-	bool controls_enabled = false;
-	QStandardItemModel * toc_model = gui_view_.tocModels().model(type);
-	if (toc_model) {
-		controls_enabled = toc_model->rowCount() > 0;
-		tocTV->setModel(toc_model);
-		tocTV->setEditTriggers(QAbstractItemView::NoEditTriggers);
-		LYXERR(Debug::GUI, "tocModel()->rowCount "
-			<< toc_model->rowCount()
-			<< "\nform_->tocModel()->columnCount "
-			<< toc_model->columnCount());
-	}
-
-	enableControls(controls_enabled);
-
-	if (controls_enabled) {
-		depthSL->setMaximum(gui_view_.tocModels().depth(type));
-		depthSL->setValue(depth_);
-	}
-
 	// setTocModel produce QTreeView reset and setting depth again
 	// is needed. That must be done after all Qt updates are processed.
 	QTimer::singleShot(0, this, SLOT(updateView()));
 }
 
+
+void TocWidget::setTocModel()
+{
+	int const toc_type = typeCO->currentIndex();
+	QStandardItemModel * toc_model = gui_view_.tocModels().model(toc_type);
+	LASSERT(toc_model, return);
+	
+	if (tocTV->model() != toc_model) {
+		tocTV->setModel(toc_model);
+		tocTV->setEditTriggers(QAbstractItemView::NoEditTriggers);
+	}
+
+	bool controls_enabled = toc_model->rowCount() > 0;;
+	enableControls(controls_enabled);
+
+	if (controls_enabled) {
+		depthSL->setMaximum(gui_view_.tocModels().depth(toc_type));
+		depthSL->setValue(depth_);
+	}
+}
+
 } // namespace frontend
 } // namespace lyx
 
diff --git a/src/frontends/qt4/TocWidget.h b/src/frontends/qt4/TocWidget.h
index 80d6d3f152..e784a7c5c7 100644
--- a/src/frontends/qt4/TocWidget.h
+++ b/src/frontends/qt4/TocWidget.h
@@ -41,7 +41,7 @@ public Q_SLOTS:
 
 protected Q_SLOTS:
 	///
-	void setTocModel(size_t type);
+	void setTocModel();
 	///
 	void select(QModelIndex const & index);
 	///