diff --git a/modules/core_styles/styles/spinboxes.otui b/modules/core_styles/styles/spinboxes.otui
index 1bcc18a4..64a69321 100644
--- a/modules/core_styles/styles/spinboxes.otui
+++ b/modules/core_styles/styles/spinboxes.otui
@@ -2,6 +2,7 @@ SpinBox < UISpinBox
   font: verdana-11px-antialised
   color: #aaaaaa
   size: 86 20
+  text-offset: 0 3
   text-margin: 3
   image-source: /core_styles/styles/images/panel_flat.png
   image-border: 1
diff --git a/modules/game/styles/countwindow.otui b/modules/game/styles/countwindow.otui
index 9228af3b..1c8285a6 100644
--- a/modules/game/styles/countwindow.otui
+++ b/modules/game/styles/countwindow.otui
@@ -1,6 +1,6 @@
 CountWindow < MainWindow
   id: countWindow
-  text: Move Staackable Item
+  text: Move Stackable Item
   size: 196 112
   @onEscape: self:destroy()
 
diff --git a/modules/game/widgets/uigamemap.lua b/modules/game/widgets/uigamemap.lua
index 3e4454a5..3420c40b 100644
--- a/modules/game/widgets/uigamemap.lua
+++ b/modules/game/widgets/uigamemap.lua
@@ -32,6 +32,10 @@ function UIGameMap:onDrop(widget, mousePos)
 
   local item = widget.currentDragThing
   local toPos = tile:getPosition()
+
+  local itemPos = item:getPosition()
+  if itemPos.x == toPos.x and itemPos.y == toPos.y and itemPos.z == toPos.z then return false end
+
   if item:isStackable() and item:getCount() > 1 then
     GameInterface.moveStackableItem(item, toPos)
   else
diff --git a/modules/game/widgets/uiitem.lua b/modules/game/widgets/uiitem.lua
index d1065d2d..53901bb6 100644
--- a/modules/game/widgets/uiitem.lua
+++ b/modules/game/widgets/uiitem.lua
@@ -25,6 +25,10 @@ function UIItem:onDrop(widget, mousePos)
 
   local item = widget.currentDragThing
   local toPos = self.position
+
+  local itemPos = item:getPosition()
+  if itemPos.x == self.position.x and itemPos.y == self.position.y and itemPos.z == self.position.z then return false end
+
   if item:isStackable() and item:getCount() > 1 then
     GameInterface.moveStackableItem(item, toPos)
   else