diff --git a/app/src/main/java/org/solovyev/android/calculator/EditorView.java b/app/src/main/java/org/solovyev/android/calculator/EditorView.java
index 2f928218..50d84c49 100644
--- a/app/src/main/java/org/solovyev/android/calculator/EditorView.java
+++ b/app/src/main/java/org/solovyev/android/calculator/EditorView.java
@@ -113,6 +113,11 @@ public class EditorView extends EditTextCompat {
         editor.setSelection(start);
     }
 
+    @Override
+    public int getAutofillType() {
+        return AUTOFILL_TYPE_NONE;
+    }
+
     private class MyTextWatcher implements TextWatcher {
         @Override
         public void beforeTextChanged(CharSequence s, int start, int count, int after) {
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8977e74d..9decfad2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -73,6 +73,7 @@
         <item name="android:paddingLeft">3dp</item>
         <item name="android:paddingTop">3dp</item>
         <item name="android:paddingBottom">3dp</item>
+        <item name="android:importantForAutofill">no</item>
     </style>
 
     <style name="CppText.Display" parent="CppText">