diff --git a/src/x11_clipboard.c b/src/x11_clipboard.c
index ca58f7e8..6c05abc6 100644
--- a/src/x11_clipboard.c
+++ b/src/x11_clipboard.c
@@ -198,7 +198,7 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window)
         XConvertSelection(_glfw.x11.display,
                           _glfw.x11.CLIPBOARD,
                           formats[i],
-                          _glfw.x11.selection.property,
+                          _glfw.x11.GLFW_SELECTION,
                           window->x11.handle, CurrentTime);
 
         // XCheckTypedEvent is used instead of XIfEvent in order not to lock
diff --git a/src/x11_init.c b/src/x11_init.c
index 75b83c23..601591a0 100644
--- a/src/x11_init.c
+++ b/src/x11_init.c
@@ -539,7 +539,7 @@ static GLboolean initDisplay(void)
         XInternAtom(_glfw.x11.display, "COMPOUND_STRING", False);
 
     // Find or create selection property atom
-    _glfw.x11.selection.property =
+    _glfw.x11.GLFW_SELECTION =
         XInternAtom(_glfw.x11.display, "GLFW_SELECTION", False);
 
     // Find or create standard clipboard atoms
diff --git a/src/x11_platform.h b/src/x11_platform.h
index a4b60d53..00f6afcf 100644
--- a/src/x11_platform.h
+++ b/src/x11_platform.h
@@ -121,6 +121,7 @@ typedef struct _GLFWlibraryX11
     Atom            CLIPBOARD;
     Atom            UTF8_STRING;
     Atom            COMPOUND_STRING;
+    Atom            GLFW_SELECTION;
 
     // True if window manager supports EWMH
     GLboolean       hasEWMH;
@@ -176,7 +177,6 @@ typedef struct _GLFWlibraryX11
 
     struct {
         char*       string;
-        Atom        property;
     } selection;
 
     struct {