diff --git a/plugins/selection/EntityReference_SelectionHandler_Views.class.php b/plugins/selection/EntityReference_SelectionHandler_Views.class.php
index 92fa7a1..06697dc 100644
--- a/plugins/selection/EntityReference_SelectionHandler_Views.class.php
+++ b/plugins/selection/EntityReference_SelectionHandler_Views.class.php
@@ -57,7 +57,13 @@ class EntityReference_SelectionHandler_Views implements EntityReference_Selectio
         '#title' => t('View arguments'),
         '#default_value' => $default,
         '#required' => FALSE,
-        '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
+        '#description' => t('Provide a comma separated list of arguments to pass to the view.') . '<br />' . t('This field supports tokens.'),
+      );
+      $form['view']['tokens'] = array(
+        '#theme' => 'token_tree',
+        '#token_types' => array(), // The token types that have specific context. Can be multiple token types like 'term' and/or 'user'
+        '#global_types' => TRUE, // A boolean TRUE or FALSE whether to include 'global' context tokens like [current-user:*] or [site:*]. Defaults to TRUE.
+        '#click_insert' => TRUE, // A boolean whether to include the 'Click this token to insert in into the the focused textfield' JavaScript functionality. Defaults to TRUE.
       );
     }
     else {
@@ -74,7 +80,7 @@ class EntityReference_SelectionHandler_Views implements EntityReference_Selectio
   protected function initializeView($match = NULL, $match_operator = 'CONTAINS', $limit = 0, $ids = NULL) {
     $view_name = $this->field['settings']['handler_settings']['view']['view_name'];
     $display_name = $this->field['settings']['handler_settings']['view']['display_name'];
-    $args = $this->field['settings']['handler_settings']['view']['args'];
+    $args = array_map( 'token_replace', $this->field['settings']['handler_settings']['view']['args'] );
     $entity_type = $this->field['settings']['target_type'];
 
     // Check that the view is valid and the display still exists.
@@ -104,7 +110,7 @@ class EntityReference_SelectionHandler_Views implements EntityReference_Selectio
    */
   public function getReferencableEntities($match = NULL, $match_operator = 'CONTAINS', $limit = 0) {
     $display_name = $this->field['settings']['handler_settings']['view']['display_name'];
-    $args = $this->field['settings']['handler_settings']['view']['args'];
+    $args = array_map( 'token_replace', $this->field['settings']['handler_settings']['view']['args'] );
     $result = array();
     if ($this->initializeView($match, $match_operator, $limit)) {
       // Get the results.
@@ -123,7 +129,7 @@ class EntityReference_SelectionHandler_Views implements EntityReference_Selectio
 
   function validateReferencableEntities(array $ids) {
     $display_name = $this->field['settings']['handler_settings']['view']['display_name'];
-    $args = $this->field['settings']['handler_settings']['view']['args'];
+    $args = array_map( 'token_replace', $this->field['settings']['handler_settings']['view']['args'] );
     $result = array();
     if ($this->initializeView(NULL, 'CONTAINS', 0, $ids)) {
       // Get the results.