diff --git a/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java b/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java
index 5a4245b..df1ddcd 100644
--- a/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java
+++ b/src/main/java/de/skate702/craftingkeys/config/GuiConfig.java
@@ -172,7 +172,7 @@ public class GuiConfig extends GuiScreen {
             }
 
         } else if (selectedButtonID != -1) {
-            if (!ArrayUtils.contains(keyValues, keyCode)) { // No double keys
+            if (!ArrayUtils.contains(keyValues, keyCode) || keyValues[selectedButtonID] == keyCode) { // No double keys
                 keyValues[selectedButtonID] = keyCode;
                 selectedButtonID = -1;
                 drawKeyValues();
diff --git a/src/main/java/de/skate702/craftingkeys/manager/ContainerManager.java b/src/main/java/de/skate702/craftingkeys/manager/ContainerManager.java
index d758cd3..6cd1ba5 100644
--- a/src/main/java/de/skate702/craftingkeys/manager/ContainerManager.java
+++ b/src/main/java/de/skate702/craftingkeys/manager/ContainerManager.java
@@ -193,8 +193,6 @@ public abstract class ContainerManager {
         // If held, move!
         if (Util.isHoldingStack()) {
 
-            // TODO: Make place?
-
             leftClick(hotbarStartIndex + inputdelta);
             Logger.info("handleNumKey()", "Moved to hotbar slot " + inputdelta + ".");