diff --git a/app/src/main/java/com/hippo/widget/HackyTextInputEditText.java b/app/src/main/java/com/hippo/widget/HackyTextInputEditText.java
index 0d6b768ae..354dcd042 100644
--- a/app/src/main/java/com/hippo/widget/HackyTextInputEditText.java
+++ b/app/src/main/java/com/hippo/widget/HackyTextInputEditText.java
@@ -17,6 +17,7 @@
 package com.hippo.widget;
 
 import android.content.Context;
+import android.graphics.Canvas;
 import android.os.Build;
 import android.support.design.widget.TextInputEditText;
 import android.util.AttributeSet;
@@ -55,4 +56,14 @@ public class HackyTextInputEditText extends TextInputEditText {
     field.setAccessible(true);
     return (CharSequence) field.get(this);
   }
+
+  // Some devices still crash
+  @Override
+  protected void onDraw(Canvas canvas) {
+    try {
+      super.onDraw(canvas);
+    } catch (Throwable t) {
+      ExceptionUtils.throwIfFatal(t);
+    }
+  }
 }