diff --git a/LSTPopView/Classes/Code/LSTPopView.m b/LSTPopView/Classes/Code/LSTPopView.m
index 6423c7b..fb0c411 100644
--- a/LSTPopView/Classes/Code/LSTPopView.m
+++ b/LSTPopView/Classes/Code/LSTPopView.m
@@ -1454,15 +1454,16 @@ - (void)keyboardWillShow:(NSNotification *)notification{
     self.keyboardWillShowBlock? self.keyboardWillShowBlock():nil;
     
     if (!self.isAvoidKeyboard) { return; }
-    CGFloat customViewMaxY = self.customView.pv_Bottom + self.avoidKeyboardSpace;
+    UIView *firstResponder = [self.customView findFirstResponder];
+    CGFloat firstResponderMaxY = CGRectGetMaxY([firstResponder convertRect:firstResponder.bounds toView:self]) + self.avoidKeyboardSpace;
     CGFloat duration = [notification.userInfo[UIKeyboardAnimationDurationUserInfoKey] floatValue];
     CGRect keyboardEedFrame = [notification.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
     CGFloat keyboardMaxY = keyboardEedFrame.origin.y;
     self.isAvoidKeyboard = YES;
-    self.avoidKeyboardOffset = customViewMaxY - keyboardMaxY;
+    self.avoidKeyboardOffset = firstResponderMaxY - keyboardMaxY;
     self.keyboardY = keyboardEedFrame.origin.y;
     //键盘遮挡到弹窗
-    if ((keyboardMaxY<customViewMaxY) || ((_originFrame.origin.y + _customView.pv_Height) > keyboardMaxY)) {
+    if (keyboardMaxY<firstResponderMaxY) {
         //执行动画
         [UIView animateWithDuration:duration animations:^{
             self.customView.pv_Y = self.customView.pv_Y - self.avoidKeyboardOffset;
diff --git a/LSTPopView/Classes/Code/UIView+LSTPV.h b/LSTPopView/Classes/Code/UIView+LSTPV.h
index d2d2735..f297cfd 100644
--- a/LSTPopView/Classes/Code/UIView+LSTPV.h
+++ b/LSTPopView/Classes/Code/UIView+LSTPV.h
@@ -44,6 +44,8 @@ CGFloat pv_ScreenWidth(void);
 /** 屏幕高度 */
 CGFloat pv_ScreenHeight(void);
 
+- (UIView *)findFirstResponder;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/LSTPopView/Classes/Code/UIView+LSTPV.m b/LSTPopView/Classes/Code/UIView+LSTPV.m
index a7944ab..7dc5440 100644
--- a/LSTPopView/Classes/Code/UIView+LSTPV.m
+++ b/LSTPopView/Classes/Code/UIView+LSTPV.m
@@ -145,4 +145,23 @@ CGFloat pv_ScreenHeight(void) {
     return size.height;
 }
 
+- (UIView *)findFirstResponder {
+    NSMutableArray<UIView *> *stack = @[self].mutableCopy;
+    BOOL stop = NO;
+    UIView *view = nil;
+    while (stack.count != 0 && !stop) {
+        if ([stack.lastObject isFirstResponder]) {
+            stop = YES;
+            view = stack.lastObject;
+            break;;
+        }
+        if (stack.lastObject.subviews.count != 0) {
+            [stack insertObjects:stack.lastObject.subviews atIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, stack.lastObject.subviews.count)]];
+        }
+        [stack removeLastObject];
+    }
+    return view;
+}
+
+
 @end