diff --git a/src/Corporation/ui/ExportModal.tsx b/src/Corporation/ui/ExportModal.tsx
index ab39e3e44..809ed4b41 100644
--- a/src/Corporation/ui/ExportModal.tsx
+++ b/src/Corporation/ui/ExportModal.tsx
@@ -6,6 +6,7 @@ import { IIndustry } from "../IIndustry";
 import { ExportMaterial } from "../Actions";
 import { Modal } from "../../ui/React/Modal";
 import { useCorporation } from "./Context";
+import { isRelevantMaterial } from "./Helpers";
 import Typography from "@mui/material/Typography";
 import TextField from "@mui/material/TextField";
 import Button from "@mui/material/Button";
@@ -22,11 +23,13 @@ interface IProps {
 // Create a popup that lets the player manage exports
 export function ExportModal(props: IProps): React.ReactElement {
   const corp = useCorporation();
-  if (corp.divisions.length === 0) throw new Error("Export popup created with no divisions.");
-  if (Object.keys(corp.divisions[0].warehouses).length === 0)
+  const possibleDivisions = corp.divisions.filter((division: IIndustry) => isRelevantMaterial(props.mat.name, division));
+  if (possibleDivisions.length === 0) throw new Error("Export popup created with no divisions.");
+  const defaultDivision = possibleDivisions[0];
+  if (Object.keys(defaultDivision.warehouses).length === 0)
     throw new Error("Export popup created in a division with no warehouses.");
-  const [industry, setIndustry] = useState<string>(corp.divisions[0].name);
-  const [city, setCity] = useState<string>(Object.keys(corp.divisions[0].warehouses)[0]);
+  const [industry, setIndustry] = useState<string>(defaultDivision.name);
+  const [city, setCity] = useState<string>(Object.keys(defaultDivision.warehouses)[0]);
   const [amt, setAmt] = useState("");
   const setRerender = useState(false)[1];
 
@@ -84,10 +87,12 @@ export function ExportModal(props: IProps): React.ReactElement {
         second. You can set the export amount to 'MAX' to export all of the materials in this warehouse.
       </Typography>
       <Select onChange={onIndustryChange} value={industry}>
-        {corp.divisions.map((division: IIndustry) => (
-          <MenuItem key={division.name} value={division.name}>
-            {division.name}
-          </MenuItem>
+        {corp.divisions
+          .filter((division: IIndustry) => isRelevantMaterial(props.mat.name, division))
+          .map((division: IIndustry) => (
+            <MenuItem key={division.name} value={division.name}>
+              {division.name}
+            </MenuItem>
         ))}
       </Select>
       <Select onChange={onCityChange} value={city}>
diff --git a/src/Corporation/ui/Helpers.tsx b/src/Corporation/ui/Helpers.tsx
index 1cf54840f..30d116105 100644
--- a/src/Corporation/ui/Helpers.tsx
+++ b/src/Corporation/ui/Helpers.tsx
@@ -4,7 +4,7 @@ import { IIndustry } from "../IIndustry";
 // current industry.
 export function isRelevantMaterial(matName: string, division: IIndustry): boolean {
   // Materials that affect Production multiplier
-  const prodMultiplierMats = ["Hardware", "Robots", "AICores", "RealEstate"];
+  const prodMultiplierMats = ["Hardware", "Robots", "AICores", "RealEstate", "AI Cores", "Real Estate"];
 
   if (Object.keys(division.reqMats).includes(matName)) {
     return true;
diff --git a/src/Corporation/ui/IndustryWarehouse.tsx b/src/Corporation/ui/IndustryWarehouse.tsx
index 899436abc..2ced07a72 100644
--- a/src/Corporation/ui/IndustryWarehouse.tsx
+++ b/src/Corporation/ui/IndustryWarehouse.tsx
@@ -95,8 +95,10 @@ function WarehouseRoot(props: IProps): React.ReactElement {
   const mats = [];
   for (const matName of Object.keys(props.warehouse.materials)) {
     if (!(props.warehouse.materials[matName] instanceof Material)) continue;
-    // Only create UI for materials that are relevant for the industry
-    if (!isRelevantMaterial(matName, division)) continue;
+    // Only create UI for materials that are relevant for the industry or in stock
+    const isInStock = props.warehouse.materials[matName].qty > 0;
+    const isRelevant = isRelevantMaterial(matName, division);
+    if (!isInStock && !isRelevant) continue;
     mats.push(
       <MaterialElem
         rerender={props.rerender}