diff --git a/src/Plugin/Condition/TokenMatcher.php b/src/Plugin/Condition/TokenMatcher.php
index 70c8680..82e0e82 100644
--- a/src/Plugin/Condition/TokenMatcher.php
+++ b/src/Plugin/Condition/TokenMatcher.php
@@ -149,14 +149,30 @@ class TokenMatcher extends ConditionPluginBase implements ContainerFactoryPlugin
       '#default_value' => $this->configuration['use_regex'],
       '#states' => $invisible_state,
     );
+
     if ($this->moduleHandler->moduleExists('token')) {
-      $form['token_tree'] = array(
-        '#theme' => 'token_tree',
+      $form['tokens'] = [
+        '#title' => $this->t('Tokens'),
+        '#type' => 'container',
+        '#states' => [
+          'invisible' => [
+            'input[name="use_token"]' => ['checked' => FALSE],
+          ],
+        ],
+      ];
+      $form['tokens']['help'] = [
+        '#theme' => 'token_tree_link',
         '#token_types' => $this->getContentTokenTypes(),
-        '#dialog' => FALSE,
-        '#weight' => 100,
-      );
+        '#global_types' => TRUE,
+        '#dialog' => TRUE,
+      ];
+    }
+    else {
+      $form['tokens'] = [
+        '#markup' => $this->t("Note: You don't have the <a href='@token-url'>Token</a> module installed, so the list of available tokens isn't shown here. You don't have to install <a href='@token-url'>Token</a> to be able to use tokens, but if you have it installed, and enabled, you'll be able to enjoy an interactive tokens browser.", ['@token-url' => 'https://www.drupal.org/project/token']),
+      ];
     }
+
     return parent::buildConfigurationForm($form, $form_state);
   }