diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb
index 71438a914..91a5396ad 100644
--- a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb
+++ b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb
@@ -76,6 +76,7 @@ class ClothesShopPresenter < PokemonMartScreen
       item = @scene.pbChooseBuyItem
       #break if !item
       if !item
+        break if @adapter.isShop?
         if pbConfirm(_INTL("Discard the changes to your outfit?"))
           break
         else
diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/HatsMartAdapter.rb b/Data/Scripts/050_Outfits/UI/clothesShop/HatsMartAdapter.rb
index 3d13d5378..bf3f49b69 100644
--- a/Data/Scripts/050_Outfits/UI/clothesShop/HatsMartAdapter.rb
+++ b/Data/Scripts/050_Outfits/UI/clothesShop/HatsMartAdapter.rb
@@ -12,6 +12,7 @@ class HatsMartAdapter < OutfitsMartAdapter
   end
 
   def toggleEvent(item)
+    return if isShop?
     $Trainer.set_hat(nil,@is_secondary_hat)
     @worn_clothes = nil
   end
@@ -32,6 +33,7 @@ class HatsMartAdapter < OutfitsMartAdapter
   end
 
   def switchVersion(item,delta=1)
+    return if isShop?
     @is_secondary_hat = !@is_secondary_hat
   end
 
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 745524fc6..e6464c571 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ