diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp
index 4363d09109..8feeb4b546 100644
--- a/src/frontends/qt4/TocWidget.cpp
+++ b/src/frontends/qt4/TocWidget.cpp
@@ -248,20 +248,13 @@ void TocWidget::updateGui()
 		return;
 	}
 
-	QString current_text = typeCO->currentText();
-	//lyxerr << "current_text " << fromqstr(current_text) << endl;
 	typeCO->blockSignals(true);
 	typeCO->clear();
-	int current_type = -1;
 	for (size_t i = 0; i != type_names.size(); ++i) {
 		QString item = toqstr(type_names[i]);
 		typeCO->addItem(item);
-		if (item == current_text)
-			current_type = i;
 	}
-	if (current_type != -1)
-		typeCO->setCurrentIndex(current_type);
-	else
+	if (form_->selectedType() != -1)
 		typeCO->setCurrentIndex(form_->selectedType());
 	typeCO->blockSignals(false);
 
diff --git a/status.15x b/status.15x
index 5d79f60060..fa0045a121 100644
--- a/status.15x
+++ b/status.15x
@@ -156,6 +156,9 @@ What's new
 - Keep unapplied content of the document settings dialog after
   clicking in the main window (bug 4302).
 
+- Select the correct list in the outliner when right-clicking on the
+  TOC- or a "List-of-"inset (bug 4260).
+
 - Fix access to network drives on Windows.
 
 - "Accept compound words" in Preferences->Spellchecker now also works