2 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml
index 66e7faf6f..6136971b6 100644
--- a/src/controls/TextArea.qml
+++ b/src/controls/TextArea.qml
@@ -717,7 +717,7 @@ ScrollView {
             wrapMode: TextEdit.WordWrap
             textMargin: 4
 
-            selectByMouse: true
+            selectByMouse: Qt.platform.os !== "android" // Workaround for QTBUG-36515
             readOnly: false
 
             Keys.forwardTo: area
diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml
index d9ba36256..1a430277e 100644
--- a/src/controls/TextField.qml
+++ b/src/controls/TextField.qml
@@ -580,7 +580,7 @@ Control {
     TextInput {
         id: textInput
         focus: true
-        selectByMouse: true
+        selectByMouse: Qt.platform.os !== "android" // Workaround for QTBUG-36515
         selectionColor: __panel ? __panel.selectionColor : "darkred"
         selectedTextColor: __panel ? __panel.selectedTextColor : "white"