diff --git a/UI/BankFrame.lua b/UI/BankFrame.lua
index 1de9bad..9b527ae 100644
--- a/UI/BankFrame.lua
+++ b/UI/BankFrame.lua
@@ -65,26 +65,6 @@ function Guda_BankFrame_OnShow(self)
     BankFrame:Update()
 end
 
--- OnHide
-function Guda_BankFrame_OnHide(self)
-    -- Clean up all buttons when frame is hidden (safe since we're not displaying)
-    for _, bankBagParent in pairs(bankBagParents) do
-        if bankBagParent then
-            local buttons = { bankBagParent:GetChildren() }
-            for _, button in ipairs(buttons) do
-                if button.hasItem ~= nil then
-                    button:Hide()
-                    button:ClearAllPoints()
-                end
-            end
-        end
-    end
-    -- Ensure the bank click catcher is hidden when the frame hides
-    if bankClickCatcher and bankClickCatcher.Hide then
-        bankClickCatcher:Hide()
-    end
-end
-
 -- Toggle visibility
 function BankFrame:Toggle()
     if Guda_BankFrame:IsShown() then
diff --git a/UI/BankFrame.xml b/UI/BankFrame.xml
index 0c63c6b..2bf3685 100644
--- a/UI/BankFrame.xml
+++ b/UI/BankFrame.xml
@@ -603,7 +603,11 @@
                 Guda_BankFrame_OnShow(this)
             </OnShow>
             <OnHide>
-                Guda_BankFrame_OnHide(this)
+                Guda_BankFrame:Hide()
+                -- Close the actual Blizzard bank too
+                if BankFrame and BankFrame:IsShown() then
+                    CloseBankFrame()
+                end
             </OnHide>
             <OnMouseDown>
                 -- Clear search box focus when clicking on bank frame