diff --git a/modules/game_interface/gameinterface.lua b/modules/game_interface/gameinterface.lua
index 76c999d2..64607b1a 100644
--- a/modules/game_interface/gameinterface.lua
+++ b/modules/game_interface/gameinterface.lua
@@ -529,6 +529,7 @@ function processMouseAction(menuPosition, mouseButton, autoWalkPos, lookThing, u
         return true
       else
         g_game.use(useThing)
+        return true
       end
       return true
     elseif lookThing and keyboardModifiers == KeyboardShiftModifier and (mouseButton == MouseLeftButton or mouseButton == MouseRightButton) then
diff --git a/modules/game_interface/widgets/uigamemap.lua b/modules/game_interface/widgets/uigamemap.lua
index 672d280e..6f490aab 100644
--- a/modules/game_interface/widgets/uigamemap.lua
+++ b/modules/game_interface/widgets/uigamemap.lua
@@ -51,7 +51,9 @@ function UIGameMap:onDrop(widget, mousePos)
 end
 
 function UIGameMap:onMousePress()
-  self.allowNextRelease = true
+  if not self:isDragging() then
+    self.allowNextRelease = true
+  end
 end
 
 function UIGameMap:onMouseRelease(mousePosition, mouseButton)