diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index c9740849fd..b4127a7a54 100644
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -405,6 +405,11 @@ void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
 
 // This is called by the Editor base class whenever something is selected
 void ScintillaWX::ClaimSelection() {
+#if 0
+    // Until wxGTK is able to support using both the primary selection and the
+    // clipboard at the same time I think it causes more problems than it is
+    // worth to implement this method.  Selecting text should not clear the
+    // clipboard.  --Robin
 #ifdef __WXGTK__
     // Put the selected text in the PRIMARY selection
     if (currentPos != anchor) {
@@ -419,6 +424,7 @@ void ScintillaWX::ClaimSelection() {
         }
     }
 #endif
+#endif
 }
 
 
diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index c9740849fd..b4127a7a54 100644
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -405,6 +405,11 @@ void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
 
 // This is called by the Editor base class whenever something is selected
 void ScintillaWX::ClaimSelection() {
+#if 0
+    // Until wxGTK is able to support using both the primary selection and the
+    // clipboard at the same time I think it causes more problems than it is
+    // worth to implement this method.  Selecting text should not clear the
+    // clipboard.  --Robin
 #ifdef __WXGTK__
     // Put the selected text in the PRIMARY selection
     if (currentPos != anchor) {
@@ -419,6 +424,7 @@ void ScintillaWX::ClaimSelection() {
         }
     }
 #endif
+#endif
 }