diff --git a/views/colorbox_handler_field_colorbox.inc b/views/colorbox_handler_field_colorbox.inc
index 7984ee46a0a68614f601e91d2905bbf211eec3bb..205d09950cd0be33b720dad4552ebb827704a184 100644
--- a/views/colorbox_handler_field_colorbox.inc
+++ b/views/colorbox_handler_field_colorbox.inc
@@ -162,10 +162,10 @@ If you would like to have the characters %5B and %5D please use the html entity
     $tokens = $this->get_render_tokens($this->options['alter']);
     $popup = filter_xss_admin($this->options['popup']);
     $caption = filter_xss_admin($this->options['caption']);
+    $gallery = filter_xss_admin($this->options['custom_gid']);
     $popup = strtr($popup, $tokens);
     $caption = strtr($caption, $tokens);
-    $gallery = strtr($this->options['custom_gid'] , $tokens);
-    $gallery = drupal_html_class($gallery);
+    $gallery = drupal_html_class(strtr($gallery, $tokens));
 
     // Return nothing if popup is empty.
     if (empty($popup)) {