diff --git a/java/form/src/org/netbeans/modules/form/editors/MnemonicEditor.java b/java/form/src/org/netbeans/modules/form/editors/MnemonicEditor.java
index 9052f75971d6..9c0aba0fb657 100644
--- a/java/form/src/org/netbeans/modules/form/editors/MnemonicEditor.java
+++ b/java/form/src/org/netbeans/modules/form/editors/MnemonicEditor.java
@@ -133,9 +133,11 @@ public void setAsText(String text) throws IllegalArgumentException {
     public void setValue(Object newValue) throws IllegalArgumentException {
         if  (newValue instanceof Integer) {
             super.setValue(newValue);
+            return;
         } else if (newValue instanceof Character) {
             char c = (Character) newValue;
             super.setValue((int)c);
+            return;
         } else if (newValue instanceof String) {
             String text = (String) newValue;
             if (text.length() >= 1) {