diff --git a/data/styles/20-spinboxes.otui b/data/styles/20-spinboxes.otui
index 9f8c72d6..5b2576f0 100644
--- a/data/styles/20-spinboxes.otui
+++ b/data/styles/20-spinboxes.otui
@@ -1,7 +1,9 @@
 SpinBox < TextEdit
   __class: UISpinBox
+  text-align: left
   size: 86 20
   padding: 0
+  padding-left: 2
 
   Button
     id: up
@@ -11,7 +13,7 @@ SpinBox < TextEdit
     image-clip: 0 0 10 10
     anchors.top: parent.top
     anchors.right: parent.right
-    @onClick: self:getParent():up()
+    @onPress: self:getParent():up()
 
     $hover:
       image-clip: 0 10 10 10
@@ -26,7 +28,7 @@ SpinBox < TextEdit
     image-clip: 0 0 10 10
     anchors.bottom: parent.bottom
     anchors.right: parent.right
-    @onClick: self:getParent():down()
+    @onPress: self:getParent():down()
 
     $hover:
       image-clip: 0 10 10 10
diff --git a/modules/game_market/ui/general/amountwindow.otui b/modules/game_market/ui/general/amountwindow.otui
index b526696f..c57dbce1 100644
--- a/modules/game_market/ui/general/amountwindow.otui
+++ b/modules/game_market/ui/general/amountwindow.otui
@@ -1,7 +1,7 @@
 AmountWindow < MainWindow
   id: amountWindow
   !text: tr('Amount')
-  size: 196 80
+  size: 270 80
 
   Item
     id: item
diff --git a/modules/game_market/ui/marketoffers.otui b/modules/game_market/ui/marketoffers.otui
index bd927469..046a8cc7 100644
--- a/modules/game_market/ui/marketoffers.otui
+++ b/modules/game_market/ui/marketoffers.otui
@@ -102,6 +102,7 @@ Panel
     width: 75
     minimum: 1
     maximum: 999999999
+    focusable: true
 
     $disabled:
       color: #aaaaaa44
@@ -123,6 +124,7 @@ Panel
     width: 75
     minimum: 1
     maximum: 999999999
+    focusable: true
 
     $disabled:
       color: #aaaaaa44
@@ -152,6 +154,7 @@ Panel
     buttons: false
     minimum: 1
     maximum: 64000
+    focusable: true
 
   NextButton
     id: nextAmountButton