diff --git a/modules/game_market/market.lua b/modules/game_market/market.lua
index 28fa7e0e..24e7ddba 100644
--- a/modules/game_market/market.lua
+++ b/modules/game_market/market.lua
@@ -1062,7 +1062,9 @@ end
 -- protocol callback functions
 
 function Market.onMarketEnter(depotItems, offers, balance, vocation)
+  Market.clearSelectedItem()
   updateBalance(balance)
+  
   information.totalOffers = offers
   local player = g_game.getLocalPlayer()
   if player then
diff --git a/modules/gamelib/gamelib.otmod b/modules/gamelib/gamelib.otmod
index 05fdb1e4..a95bd173 100644
--- a/modules/gamelib/gamelib.otmod
+++ b/modules/gamelib/gamelib.otmod
@@ -19,3 +19,5 @@ Module
     dofile 'player'
     dofile 'market'
     dofile 'thing'
+    
+    dofiles 'ui'
diff --git a/modules/corelib/ui/uicreaturebutton.lua b/modules/gamelib/ui/uicreaturebutton.lua
similarity index 100%
rename from modules/corelib/ui/uicreaturebutton.lua
rename to modules/gamelib/ui/uicreaturebutton.lua