diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 14c64b1..e5634df 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -1061,7 +1061,7 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
 #endif
 #endif
 
-#if !defined(ENABLE_PAN_SCROLLING) && OS(WINDOWS)
+#if !defined(ENABLE_PAN_SCROLLING)
 #define ENABLE_PAN_SCROLLING 1
 #endif
 
diff --git a/WebCore/dom/Node.cpp b/WebCore/dom/Node.cpp
index df4039c..d89ad9e 100644
--- a/WebCore/dom/Node.cpp
+++ b/WebCore/dom/Node.cpp
@@ -3024,6 +3024,10 @@ void Node::defaultEventHandler(Event* event)
                 return;
 
             RenderObject* renderer = this->renderer();
+
+            if (renderer->isTextControl() || rootEditableElement())
+                return;
+
             while (renderer && (!renderer->isBox() || !toRenderBox(renderer)->canBeScrolledAndHasScrollableArea()))
                 renderer = renderer->parent();