diff --git a/src/ui/SelectedBuildingPanel.cpp b/src/ui/SelectedBuildingPanel.cpp
index a806292..0b816ab 100644
--- a/src/ui/SelectedBuildingPanel.cpp
+++ b/src/ui/SelectedBuildingPanel.cpp
@@ -203,9 +203,8 @@ void SelectedBuildingPanel::rebuild()
     }
 }
 
-void SelectedBuildingPanel::clearContent()
+void SelectedBuildingPanel::hideAllWidgets()
 {
-    m_singleBuildingId = kInvalidBuildingId;
     m_titleLabel->hide();
     m_recipeCombo->hide();
     m_layoutPreview->hide();
@@ -218,6 +217,12 @@ void SelectedBuildingPanel::clearContent()
     m_buffersLabel->hide();
 }
 
+void SelectedBuildingPanel::clearContent()
+{
+    m_singleBuildingId = kInvalidBuildingId;
+    hideAllWidgets();
+}
+
 void SelectedBuildingPanel::buildEmpty()
 {
     clearContent();
@@ -229,6 +234,7 @@ void SelectedBuildingPanel::buildEmpty()
 void SelectedBuildingPanel::buildSingle(BuildingId id)
 {
     m_singleBuildingId = id;
+    hideAllWidgets();
 
     const Building* b = m_sim->buildings().findBuilding(id);
     if (!b)
diff --git a/src/ui/SelectedBuildingPanel.h b/src/ui/SelectedBuildingPanel.h
index ad460df..662b1b3 100644
--- a/src/ui/SelectedBuildingPanel.h
+++ b/src/ui/SelectedBuildingPanel.h
@@ -58,6 +58,7 @@ private slots:
 private:
     void onSelectionChanged(const std::vector<BuildingId>& ids);
     void rebuild();
+    void hideAllWidgets();
     void clearContent();
     void buildEmpty();
     void buildSingle(BuildingId id);