diff --git a/src/scripts/controllers/inventory_controller.coffee b/src/scripts/controllers/inventory_controller.coffee
index 2dc0d991e..4806af667 100644
--- a/src/scripts/controllers/inventory_controller.coffee
+++ b/src/scripts/controllers/inventory_controller.coffee
@@ -86,6 +86,7 @@ module.exports = class InventoryController extends BaseController
     onQuantityFieldBlur: ->
         value = @$quantityField.val().replace /[^0-9]/g, ''
         if value.length is 0 then value = '1'
+        value = Math.min value, 64
         @$quantityField.val value
         @onQuantityFieldChanged()
 
@@ -101,6 +102,9 @@ module.exports = class InventoryController extends BaseController
         @$quantityField.removeClass 'error-new', Duration.fast
         @_updateButtonState()
 
+    onQuantityFieldFocused: ->
+        @$quantityField.val ''
+
     # BaseController Overrides #####################################################################
 
     onDidRender: ->
@@ -153,6 +157,7 @@ module.exports = class InventoryController extends BaseController
         'click button[name="add"]':     'onAddButtonClicked'
         'click button[name="clear"]':   'onClearButtonClicked'
         'focus input[name="name"]':     'onNameFieldFocused'
+        'focus input[name="quantity"]': 'onQuantityFieldFocused'
         'input input[name="name"]':     'onNameFieldChanged'
         'input input[name="quantity"]': 'onQuantityFieldChanged'
         'keyup input[name="name"]':     'onNameFieldKeyUp'