diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
index 1f6a4630e..95b4866ba 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@@ -55,6 +55,7 @@ import android.support.v7.app.AlertDialog;
 import android.support.v7.content.res.AppCompatResources;
 import android.support.v7.widget.Toolbar;
 import android.text.Editable;
+import android.text.InputType;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -232,6 +233,10 @@ public class ComposeActivity extends BaseActivity implements ComposeOptionsFragm
             }
         });
 
+        //fix a bug with autocomplete and some keyboards
+        int newInputType = textEditor.getInputType() & (textEditor.getInputType() ^ InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE);
+        textEditor.setInputType(newInputType);
+
         /* Initialise all the state, or restore it from a previous run, to determine a "starting"
          * state. */
         SharedPreferences preferences = getPrivatePreferences();