diff --git a/src/main/java/com/sparrowwallet/sparrow/control/MnemonicGridDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/MnemonicGridDialog.java
index 9e4a2f6f..5fca71ae 100644
--- a/src/main/java/com/sparrowwallet/sparrow/control/MnemonicGridDialog.java
+++ b/src/main/java/com/sparrowwallet/sparrow/control/MnemonicGridDialog.java
@@ -148,6 +148,13 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
                     break;
                 }
             }
+
+            try {
+                int index = Integer.parseInt(abbreviation);
+                words.add(Bip39MnemonicCode.INSTANCE.getWordList().get(index - 1));
+            } catch(NumberFormatException e) {
+                //ignore
+            }
         }
 
         if(words.size() != abbreviations.size()) {
diff --git a/src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystorePane.java b/src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystorePane.java
index b2816931..7bfea182 100644
--- a/src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystorePane.java
+++ b/src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystorePane.java
@@ -100,6 +100,7 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
         Optional<List<String>> optWords = mnemonicGridDialog.showAndWait();
         if(optWords.isPresent()) {
             List<String> words = optWords.get();
+            defaultWordSizeProperty.set(words.size() + 1);
             setContent(getMnemonicWordsEntry(words.size() + 1, true, true));
             setExpanded(true);