diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/gui/WidgetConfigListEntry.java b/src/main/java/io/github/darkkronicle/advancedchatcore/gui/WidgetConfigListEntry.java
index 9a7be73..24d183d 100644
--- a/src/main/java/io/github/darkkronicle/advancedchatcore/gui/WidgetConfigListEntry.java
+++ b/src/main/java/io/github/darkkronicle/advancedchatcore/gui/WidgetConfigListEntry.java
@@ -121,8 +121,8 @@ protected boolean onKeyTypedImpl(int keyCode, int scanCode, int modifiers) {
             return false;
         }
         for (TextFieldWrapper<GuiTextFieldGeneric> field : getTextFields()) {
-            if (field != null && field.onKeyTyped(keyCode, scanCode, modifiers)) {
-                return true;
+            if (field != null && field.isFocused()) {
+                return field.onKeyTyped(keyCode, scanCode, modifiers);
             }
         }
         return false;
@@ -132,7 +132,7 @@ protected boolean onKeyTypedImpl(int keyCode, int scanCode, int modifiers) {
     protected boolean onCharTypedImpl(char charIn, int modifiers) {
         if (getTextFields() != null) {
             for (TextFieldWrapper<GuiTextFieldGeneric> field : getTextFields()) {
-                if (field != null && field.getTextField().charTyped(charIn, modifiers)) {
+                if (field != null && field.onCharTyped(charIn, modifiers)) {
                     return true;
                 }
             }
diff --git a/src/main/java/io/github/darkkronicle/advancedchatcore/gui/buttons/NamedSimpleButton.java b/src/main/java/io/github/darkkronicle/advancedchatcore/gui/buttons/NamedSimpleButton.java
index c1ef088..3759074 100644
--- a/src/main/java/io/github/darkkronicle/advancedchatcore/gui/buttons/NamedSimpleButton.java
+++ b/src/main/java/io/github/darkkronicle/advancedchatcore/gui/buttons/NamedSimpleButton.java
@@ -18,7 +18,7 @@ public NamedSimpleButton(int x, int y, String text) {
 
     public NamedSimpleButton(int x, int y, String text, boolean alineLeft) {
         super(x, y, 5, 20, text);
-        setWidth(StringUtils.getStringWidth(text) + 2);
+        setWidth(StringUtils.getStringWidth(text) + 10);
         if (!alineLeft) {
             setX(this.x - this.width);
         }