diff --git a/app/src/main/java/com/beemdevelopment/aegis/helpers/EditTextHelper.java b/app/src/main/java/com/beemdevelopment/aegis/helpers/EditTextHelper.java
index 1bbcc665..4896925c 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/helpers/EditTextHelper.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/helpers/EditTextHelper.java
@@ -14,9 +14,17 @@ public class EditTextHelper {
     }
 
     public static char[] getEditTextChars(EditText text) {
-        Editable editable = text.getText();
-        char[] chars = new char[editable.length()];
-        editable.getChars(0, editable.length(), chars, 0);
+        return getEditTextChars(text, false);
+    }
+
+    public static char[] getEditTextChars(EditText text, boolean removeSpaces) {
+        String editTextString = text.getText().toString();
+        if (removeSpaces) {
+            editTextString = editTextString.replaceAll("\\s","");
+        }
+
+        char[] chars = new char[editTextString.length()];
+        editTextString.getChars(0, editTextString.length(), chars, 0);
         return chars;
     }
 
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/EditEntryActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/EditEntryActivity.java
index 48eac590..43a6011e 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/EditEntryActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/EditEntryActivity.java
@@ -444,7 +444,7 @@ public class EditEntryActivity extends AegisActivity {
 
         byte[] secret;
         try {
-            secret = Base32.decode(EditTextHelper.getEditTextChars(_textSecret));
+            secret = Base32.decode(EditTextHelper.getEditTextChars(_textSecret, true));
         } catch (Base32Exception e) {
             throw new ParseException("Secret is not valid base32.");
         }