diff --git a/src/x11/xprops.c b/src/x11/xprops.c
index 2dea2869a..fb9cc2041 100644
--- a/src/x11/xprops.c
+++ b/src/x11/xprops.c
@@ -241,13 +241,13 @@ get_property (MetaDisplay        *display,
 
 static gboolean
 atom_list_from_results (GetPropertyResults *results,
-                        Atom              **atoms_p,
+                        uint32_t          **atoms_p,
                         int                *n_atoms_p)
 {
   if (!validate_or_free_results (results, 32, XA_ATOM, FALSE))
     return FALSE;
 
-  *atoms_p = (Atom*) results->prop;
+  *atoms_p = (uint32_t*) results->prop;
   *n_atoms_p = results->n_items;
   results->prop = NULL;
 
diff --git a/src/x11/xprops.h b/src/x11/xprops.h
index 7500c3478..17a08ceb5 100644
--- a/src/x11/xprops.h
+++ b/src/x11/xprops.h
@@ -170,8 +170,8 @@ typedef struct
 
     struct
     {
-      Atom *atoms;
-      int   n_atoms;
+      uint32_t *atoms;
+      int       n_atoms;
     } atom_list;
 
   } v;