diff --git a/modules/game_interface/gameinterface.lua b/modules/game_interface/gameinterface.lua
index 19e8fae6..b8d7624b 100644
--- a/modules/game_interface/gameinterface.lua
+++ b/modules/game_interface/gameinterface.lua
@@ -354,7 +354,11 @@ function onUseWith(clickedWidget, mousePosition)
   if clickedWidget:getClassName() == 'UIMap' then
     local tile = clickedWidget:getTile(mousePosition)
     if tile then
-      g_game.useWith(selectedThing, tile:getTopMultiUseThing())
+      if selectedThing:isFluidContainer() then
+        g_game.useWith(selectedThing, tile:getTopMultiUseThing())
+      else
+        g_game.useWith(selectedThing, tile:getTopUseThing())
+      end
     end
   elseif clickedWidget:getClassName() == 'UIItem' and not clickedWidget:isVirtual() then
     g_game.useWith(selectedThing, clickedWidget:getItem())