diff --git a/modules/bags.lua b/modules/bags.lua
index d343d98a..d8d8ebb0 100644
--- a/modules/bags.lua
+++ b/modules/bags.lua
@@ -1051,6 +1051,27 @@ pfUI:RegisterModule("bags", "vanilla:tbc", function ()
             end
           end
         end)
+
+        frame.search.edit:SetScript("OnLeave", function()
+          if GetMouseFocus() ~= this then
+            this:ClearFocus()
+          end
+        end)
+
+        frame.search:SetScript("OnHide", function()
+          frame.search.edit:SetText(T["Search"])
+          for bag = -2, 11 do
+            if pfUI.bags[bag] then
+              local bagsize = GetContainerNumSlots(bag)
+              if bag == -2 and pfUI.bag.showKeyring == true then bagsize = GetKeyRingSize() end
+              for slot = 1, bagsize do
+                if pfUI.bags[bag] and pfUI.bags[bag].slots[slot] then
+                  pfUI.bags[bag].slots[slot].frame:SetAlpha(1)
+                end
+              end
+            end
+          end
+        end)
       end
     else
       -- bankframe
@@ -1123,4 +1144,4 @@ pfUI:RegisterModule("bags", "vanilla:tbc", function ()
       end
     end
   end
-end)
+end)
\ No newline at end of file