1 files changed, 11 insertions, 0 deletions
diff --git a/src/gui/itemamount.cpp b/src/gui/itemamount.cpp
index 20834c54..71e19e3c 100644
--- a/src/gui/itemamount.cpp
+++ b/src/gui/itemamount.cpp
@@ -33,6 +33,7 @@
 #include "gui/widgets/icon.h"
 
 #include "item.h"
+#include "keyboardconfig.h"
 
 #include "net/inventoryhandler.h"
 #include "net/net.h"
@@ -73,6 +74,10 @@ ItemAmountWindow::ItemAmountWindow(Usage usage, Window *parent, Item *item,
     if (!mMax)
         mMax = mItem->getQuantity();
 
+    // Save keyboard state
+    mEnabledKeyboard = keyboard.isEnabled();
+    keyboard.setEnabled(false);
+
     // Integer field
     mItemAmountTextField = new IntTextField(1);
     mItemAmountTextField->setRange(1, mMax);
@@ -224,3 +229,9 @@ void ItemAmountWindow::showWindow(Usage usage, Window *parent, Item *item,
         new ItemAmountWindow(usage, parent, item, maxRange);
     }
 }
+
+void ItemAmountWindow::scheduleDelete()
+{
+    keyboard.setEnabled(mEnabledKeyboard);
+    Window::scheduleDelete();
+}