diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp
index ea95436013e..69e94a0a617 100644
--- a/src/plugins/projectexplorer/toolchainoptionspage.cpp
+++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp
@@ -573,7 +573,9 @@ void ToolChainOptionsPage::toolChainSelectionChanged()
     if (!m_container)
         return;
     QModelIndex current = currentIndex();
-    (void)m_container->takeWidget(); // Prevent deletion.
+    QWidget *oldWidget = m_container->takeWidget(); // Prevent deletion.
+    if (oldWidget)
+        oldWidget->setVisible(false);
     QWidget *currentTcWidget = current.isValid() ? m_model->widget(current) : 0;
     m_container->setWidget(currentTcWidget);
     m_container->setVisible(currentTcWidget != 0);