diff --git a/src/picker_gui.cpp b/src/picker_gui.cpp
index a6e3090316..763ceab8b3 100644
--- a/src/picker_gui.cpp
+++ b/src/picker_gui.cpp
@@ -357,9 +357,11 @@ void PickerWindow::DrawWidget(const Rect &r, WidgetID widget) const
 			break;
 		}
 
-		case WID_PW_TYPE_NAME:
-			DrawString(r, this->callbacks.GetTypeName(this->callbacks.GetSelectedClass(), this->callbacks.GetSelectedType()), TC_GOLD, SA_CENTER);
+		case WID_PW_TYPE_NAME: {
+			StringID str = this->callbacks.GetTypeName(this->callbacks.GetSelectedClass(), this->callbacks.GetSelectedType());
+			if (str != INVALID_STRING_ID) DrawString(r, str, TC_GOLD, SA_CENTER);
 			break;
+		}
 	}
 }
 
diff --git a/src/town_gui.cpp b/src/town_gui.cpp
index 04e999bf4e..8011b6334d 100644
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -1782,7 +1782,7 @@ struct BuildHouseWindow : public PickerWindow {
 		PickerInvalidations pi(data);
 		if (pi.Test(PickerInvalidation::Position)) {
 			UpdateSelectSize(spec);
-			this->house_info = GetHouseInformation(spec);
+			this->house_info = spec->enabled ? GetHouseInformation(spec) : "";
 		}
 
 		/* If house spec already has the protected flag, handle it automatically and disable the buttons. */