diff --git a/submodules/Display/Display/TextNode.swift b/submodules/Display/Display/TextNode.swift
index 845eaed6dc..718b750e72 100644
--- a/submodules/Display/Display/TextNode.swift
+++ b/submodules/Display/Display/TextNode.swift
@@ -476,7 +476,6 @@ public final class TextNodeLayout: NSObject {
                         }
                     }
                     var lineFrame = CGRect(origin: CGPoint(x: line.frame.origin.x, y: line.frame.origin.y - line.frame.size.height + self.firstLineOffset), size: line.frame.size)
-                    
                     lineFrame = displayLineFrame(frame: lineFrame, isRTL: line.isRTL, boundingRect: CGRect(origin: CGPoint(), size: self.size), cutout: self.cutout)
                     
                     let width = abs(rightOffset - leftOffset)
@@ -528,7 +527,7 @@ public final class TextNodeLayout: NSObject {
                         var lineFrame = CGRect(origin: CGPoint(x: line.frame.origin.x, y: line.frame.origin.y - line.frame.size.height + self.firstLineOffset), size: line.frame.size)
                         lineFrame = displayLineFrame(frame: lineFrame, isRTL: line.isRTL, boundingRect: CGRect(origin: CGPoint(), size: self.size), cutout: self.cutout)
                         
-                        let rect = CGRect(origin: CGPoint(x: lineFrame.minX + leftOffset + self.insets.left, y: lineFrame.minY + self.insets.top), size: CGSize(width: rightOffset - leftOffset, height: lineFrame.size.height))
+                        let rect = CGRect(origin: CGPoint(x: lineFrame.minX + min(leftOffset, rightOffset) + self.insets.left, y: lineFrame.minY + self.insets.top), size: CGSize(width: abs(rightOffset - leftOffset), height: lineFrame.size.height))
                         if coveringRect.isEmpty {
                             coveringRect = rect
                         } else {
diff --git a/submodules/MediaPlayer/Sources/MediaPlayerScrubbingNode.swift b/submodules/MediaPlayer/Sources/MediaPlayerScrubbingNode.swift
index 695c50bdf5..b445570dd9 100644
--- a/submodules/MediaPlayer/Sources/MediaPlayerScrubbingNode.swift
+++ b/submodules/MediaPlayer/Sources/MediaPlayerScrubbingNode.swift
@@ -46,12 +46,7 @@ private final class MediaPlayerScrubbingNodeButton: ASDisplayNode, UIGestureReco
         guard let gestureRecognizer = gestureRecognizer as? UIPanGestureRecognizer else {
             return !self.verticalPanEnabled
         }
-        let translation = gestureRecognizer.translation(in: gestureRecognizer.view)
-        if self.verticalPanEnabled {
-            return abs(translation.x) > abs(translation.y) || translation.y > 0.0
-        } else {
-            return abs(translation.x) > abs(translation.y)
-        }
+        return true
     }
     
     override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
@@ -853,7 +848,11 @@ public final class MediaPlayerScrubbingNode: ASDisplayNode {
         switch self.contentNodes {
         case let .standard(node):
             if let handleNodeContainer = node.handleNodeContainer, handleNodeContainer.isUserInteractionEnabled, handleNodeContainer.frame.insetBy(dx: 0.0, dy: -5.0).contains(point) {
-                return handleNodeContainer.view
+                if let handleNode = node.handleNode, handleNode.convert(handleNode.bounds, to: self).insetBy(dx: -5.0, dy: -5.0).contains(point) {
+                    return handleNodeContainer.view
+                } else {
+                    return nil
+                }
             } else {
                 return nil
             }