diff --git a/l3kernel/CHANGELOG.md b/l3kernel/CHANGELOG.md
index ebaa600c1d..9a42156ccc 100644
--- a/l3kernel/CHANGELOG.md
+++ b/l3kernel/CHANGELOG.md
@@ -14,6 +14,7 @@ this project uses date-based 'snapshot' version identifiers.
 ### Fixed
 
 - Correct fp randint with zero argument (see #507)
+- Handling of `\current@color` with (x)dvipdfmx` (see #510)
 
 ### Removed
 
diff --git a/l3kernel/l3drivers.dtx b/l3kernel/l3drivers.dtx
index 535714e56a..d0a54235eb 100644
--- a/l3kernel/l3drivers.dtx
+++ b/l3kernel/l3drivers.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-%% File: l3drivers.dtx Copyright(C) 2011-2018 The LaTeX3 Project
+%% File: l3drivers.dtx Copyright(C) 2011-2019 The LaTeX3 Project
 %
 % It may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -638,8 +638,8 @@
                    }
               }
               {
-                \exp_after:wN \@@_color_pickup:w
-                  \current@color \q_stop #1
+                \exp_last_unbraced:Nx \@@_color_pickup:w
+                  { \current@color } \q_stop #1
               }
           }
         \cs_new_protected:Npn \@@_color_pickup:w #1 ~ #2 \q_stop #3