diff --git a/src/object_gui.cpp b/src/object_gui.cpp
index 429f7a40f5..4af9c6f697 100644
--- a/src/object_gui.cpp
+++ b/src/object_gui.cpp
@@ -82,6 +82,7 @@ public:
 		NWidgetMatrix *matrix = this->GetWidget<NWidgetMatrix>(WID_BO_SELECT_MATRIX);
 		matrix->SetScrollbar(this->GetScrollbar(WID_BO_SELECT_SCROLL));
 		matrix->SetCount(ObjectClass::Get(_selected_object_class)->GetUISpecCount());
+		if (_selected_object_index != -1) matrix->SetClicked(_selected_object_index);
 	}
 
 	virtual ~BuildObjectWindow()