diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Dialogs/ManualEntryDialog.java b/app/src/main/java/org/shadowice/flocke/andotp/Dialogs/ManualEntryDialog.java
index dfd1ce7c..cf8aa239 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/Dialogs/ManualEntryDialog.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Dialogs/ManualEntryDialog.java
@@ -200,7 +200,8 @@ public class ManualEntryDialog {
 
                         String issuer = issuerInput.getText().toString();
                         String label = labelInput.getText().toString();
-                        String secret = secretInput.getText().toString();
+                        //Replace spaces with empty characters
+                        String secret = secretInput.getText().toString().replaceAll("\\s+","");
                         int digits = Integer.parseInt(digitsInput.getText().toString());
 
                         if (type == Entry.OTPType.TOTP || type == Entry.OTPType.STEAM) {