diff --git a/Patches/ProductionPatch.cs b/Patches/ProductionPatch.cs
new file mode 100644
index 0000000..2e546c5
--- /dev/null
+++ b/Patches/ProductionPatch.cs
@@ -0,0 +1,121 @@
+using Aki.Reflection.Patching;
+using EFT.Hideout;
+using EFT.UI;
+using HarmonyLib;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using UnityEngine.UI;
+
+namespace UIFixes
+{
+    public class ProductionPanelPatches
+    {
+        private static FieldInfo ProductionPanelSearch;
+        private static FieldInfo SubstrateContentLayoutField;
+
+        private static Dictionary<string, string> LastSearches = [];
+
+        public static void Enable()
+        {
+            ProductionPanelSearch = AccessTools.Field(typeof(ProductionPanel), "_searchInputField");
+            SubstrateContentLayoutField = AccessTools.Field(typeof(AreaScreenSubstrate), "_contentLayout");
+
+            new LazyShowPatch().Enable();
+            new ShowContentsPatch().Enable();
+            new ClosePatch().Enable();
+            new ReturnToPreviousStatePatch().Enable();
+        }
+
+        // Deactivate ProduceViews as they lazy load if they don't match the search
+        public class LazyShowPatch : ModulePatch
+        {
+            protected override MethodBase GetTargetMethod()
+            {
+                Type type = typeof(ProductionPanel).GetNestedTypes().First(t =>
+                {
+                    MethodInfo method = t.GetMethod("method_6");
+                    return method != null && method.GetParameters().Length == 2 && method.GetParameters()[1].ParameterType == typeof(ProduceView);
+                });
+
+                return AccessTools.Method(type, "method_6");
+            }
+
+            [PatchPostfix]
+            private static void Postfix(ProductionPanel.Class1631 __instance, GClass1923 scheme, ProduceView view)
+            {
+                var searchField = ProductionPanelSearch.GetValue(__instance.productionPanel_0) as ValidationInputField;
+                if (searchField.text.Length > 0 && scheme.endProduct.LocalizedName().IndexOf(searchField.text, StringComparison.InvariantCultureIgnoreCase) < 0)
+                {
+                    view.GameObject.SetActive(false);
+                }
+            }
+        }
+
+        // Populate the search box, and force the window to render
+        public class ShowContentsPatch : ModulePatch
+        {
+
+            protected override MethodBase GetTargetMethod()
+            {
+                return AccessTools.Method(typeof(ProductionPanel), "ShowContents");
+            }
+
+            [PatchPostfix]
+            private static void Postfix(ProductionPanel __instance)
+            {
+                var searchField = ProductionPanelSearch.GetValue(__instance) as ValidationInputField;
+                string lastSearch;
+                if (LastSearches.TryGetValue(__instance.AreaData.ToString(), out lastSearch))
+                {
+                    searchField.text = lastSearch;
+                }
+
+                // Force it to render immediately, at full height, even if the search filtering would reduce the number of children
+                if (__instance.method_4().Count() > 2)
+                {
+                    AreaScreenSubstrate areaScreenSubstrate = __instance.GetComponentInParent<AreaScreenSubstrate>();
+                    LayoutElement layoutElement = SubstrateContentLayoutField.GetValue(areaScreenSubstrate) as LayoutElement;
+                    layoutElement.minHeight = 750f; // aka areaScreenSubstrate._maxHeight
+                    areaScreenSubstrate.method_8();
+                }
+            }
+        }
+
+        // Save the search as the window closes
+        public class ClosePatch : ModulePatch
+        {
+            protected override MethodBase GetTargetMethod()
+            {
+                return AccessTools.Method(typeof(ProductionPanel), "Close");
+            }
+
+            [PatchPrefix]
+            private static void Prefix(ProductionPanel __instance, ValidationInputField ____searchInputField)
+            {
+                LastSearches[__instance.AreaData.ToString()] = ____searchInputField.text;
+
+                // Reset the default behavior
+                AreaScreenSubstrate areaScreenSubstrate = __instance.GetComponentInParent<AreaScreenSubstrate>();
+                LayoutElement layoutElement = SubstrateContentLayoutField.GetValue(areaScreenSubstrate) as LayoutElement;
+                layoutElement.minHeight = -1f;
+            }
+        }
+
+        // Clear the search stuff when you exit out
+        public class ReturnToPreviousStatePatch : ModulePatch
+        {
+            protected override MethodBase GetTargetMethod()
+            {
+                return AccessTools.Method(typeof(HideoutScreenOverlay), "ReturnToPreviousState");
+            }
+
+            [PatchPostfix]
+            private static void Postfix()
+            {
+                LastSearches.Clear();
+            }
+        }
+    }
+}
diff --git a/Plugin.cs b/Plugin.cs
index fa8adaf..b0f6f81 100644
--- a/Plugin.cs
+++ b/Plugin.cs
@@ -22,6 +22,7 @@ namespace UIFixes
             new ContainerStackPatch().Enable();
             DialogPatches.Enable();
             ItemPanelResizePatches.Enable();
+            ProductionPanelPatches.Enable();
         }
     }
 }