diff --git a/library/src/main/java/com/xwray/passwordview/PasswordView.java b/library/src/main/java/com/xwray/passwordview/PasswordView.java
index 6d609ec..41c3b38 100644
--- a/library/src/main/java/com/xwray/passwordview/PasswordView.java
+++ b/library/src/main/java/com/xwray/passwordview/PasswordView.java
@@ -91,8 +91,11 @@ protected void setup() {
     }
 
     @Override public boolean onTouchEvent(MotionEvent event) {
+        int drawableRightX = getWidth() - getPaddingRight();
+        int drawableLeftX = drawableRightX - getCompoundDrawables()[2].getBounds().width();
+
         if (event.getAction() == MotionEvent.ACTION_DOWN
-                && event.getX() >= (getRight() - getCompoundDrawables()[2].getBounds().width())) {
+                && event.getX() >= drawableLeftX && event.getX() <= drawableRightX) {
             visible = !visible;
             setup();
             invalidate();